Bazaar Hg Plugin

Merge lp://staging/~leonidborisenko/bzr-hg/hacking into lp://staging/bzr-hg

hacking
Merge into trunk

Proposed by Leonid Borisenko on 2010-12-18

Status:

Merged

Merged at revision:

327

Proposed branch:

lp://staging/~leonidborisenko/bzr-hg/hacking

Merge into:

lp://staging/bzr-hg

Diff against target:

101 lines (+64/-11)

3 files modified

fetch.py (+14/-11)
tests/__init__.py (+1/-0)
tests/test_fetch.py (+49/-0)

To merge this branch:

bzr merge lp://staging/~leonidborisenko/bzr-hg/hacking

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij (community)		2010-12-18	Approve on 2010-12-19
Review via email: mp+44145@code.staging.launchpad.net

Description of the change

Fix recursive removing of parent empty directories

Fact of removing empty directory (in converting of manifest to inventory delta) could reveal that parent directory is now empty too. This consequence is taken in account in existing code and parent directory is added to maybe_empty_dirs dictionary. But reiterating over modified dictionary wasn't implemented, which caused bug with directories removed from Mercurial repository but existed in Bazaar mirror.

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2010-12-18:

Hi Leonid,

Thanks for the patch! Any chance you can also add a test that reproduces
the issue and is fixed by your patch?

Cheers,

Jelmer

On Sat, 2010-12-18 at 19:36 +0000, Leonid Borisenko wrote:
> Leonid Borisenko has proposed merging lp:~leonidborisenko/bzr-hg/fix-removing-empty-dirs into lp:bzr-hg.
>
> Requested reviews:
> bzr-hg developers (bzr-hg)

Revision history for this message

Leonid Borisenko (leonidborisenko) wrote on 2010-12-19:

On 18.12.2010 22:49, Jelmer Vernooij wrote:
> Thanks for the patch! Any chance you can also add a test that reproduces
> the issue and is fixed by your patch?

Done.

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2010-12-19:

On Sun, 2010-12-19 at 02:01 +0000, Leonid Borisenko wrote:
> On 18.12.2010 22:49, Jelmer Vernooij wrote:
> > Thanks for the patch! Any chance you can also add a test that reproduces
> > the issue and is fixed by your patch?
> Done.
Thanks, much appreciated!

review approve

Cheers,

Jelmer

review: Approve

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2010-12-19:

On Sun, 2010-12-19 at 15:34 +0000, Jelmer Vernooij wrote:
> Review: Approve
> On Sun, 2010-12-19 at 02:01 +0000, Leonid Borisenko wrote:
> > On 18.12.2010 22:49, Jelmer Vernooij wrote:
> > > Thanks for the patch! Any chance you can also add a test that reproduces
> > > the issue and is fixed by your patch?
> > Done.
> Thanks, much appreciated!
>
> review approve
One more small thing - can you perhaps add a file header to
test_fetch.py, similar to the one in e.g. __init__.py ?

I'll merge.

Thanks,

Jelmer

Revision history for this message

Leonid Borisenko (leonidborisenko) wrote on 2010-12-19:

On 19.12.2010 17:43, Jelmer Vernooij wrote:
> One more small thing - can you perhaps add a file header to
> test_fetch.py, similar to the one in e.g. __init__.py ?
>
> I'll merge.

Header is added.

lp://staging/~leonidborisenko/bzr-hg/hacking updated on 2010-12-19

327. By Jelmer Vernooij on 2010-12-19: Fix recursive removing of parent empty directories.

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2010-12-19:

On Sun, 2010-12-19 at 19:26 +0000, Leonid Borisenko wrote:
> On 19.12.2010 17:43, Jelmer Vernooij wrote:
> > One more small thing - can you perhaps add a file header to
> > test_fetch.py, similar to the one in e.g. __init__.py ?
> >
> > I'll merge.
>
> Header is added.

Thanks again. I've merged your branch.

Cheers,

Jelmer