Merge lp://staging/~a1s/brz/3.2 into lp://staging/brz/3.2

Proposed by Aleksandr Smyshliaev
Status: Needs review
Proposed branch: lp://staging/~a1s/brz/3.2
Merge into: lp://staging/brz/3.2
Diff against target: 671 lines (+216/-99)
9 files modified
breezy/_walkdirs_win32.pyx (+19/-17)
breezy/osutils.py (+2/-1)
breezy/plugins/upload/tests/test_upload.py (+13/-0)
breezy/tests/__init__.py (+31/-11)
breezy/tests/test__walkdirs_win32.py (+13/-16)
breezy/tests/test_bedding.py (+28/-5)
breezy/tests/test_config.py (+42/-19)
breezy/tests/test_osutils.py (+63/-27)
breezy/transport/local.py (+5/-3)
To merge this branch: bzr merge lp://staging/~a1s/brz/3.2
Reviewer Review Type Date Requested Status
Breezy developers Pending
Review via email: mp+412781@code.staging.launchpad.net

Description of the change

This is an ongoing effort to make Breezy work on Windows

To post a comment you must log in.
Revision history for this message
Aleksandr Smyshliaev (a1s) wrote :

This includes changes from the merge proposal https://code.launchpad.net/~a1s/brz/3.2-windows-test_osutils/+merge/412025

The other thing hat has been fixed after that is passing the regression tests run by brz selftes test_config.

Revision history for this message
Jelmer Vernooij (jelmer) :
Revision history for this message
Aleksandr Smyshliaev (a1s) :
Revision history for this message
Jelmer Vernooij (jelmer) :
Revision history for this message
Aleksandr Smyshliaev (a1s) :
lp://staging/~a1s/brz/3.2 updated
7564. By Aleksandr Smyshliaev

Merge brz/3.2

7565. By Aleksandr Smyshliaev

Get rid of osutils.open_file: in Python 3.4 and newer file descriptors are non-inheritable by default

7566. By Aleksandr Smyshliaev

Use relative import paths in test__walkdirs_win32

Revision history for this message
Aleksandr Smyshliaev (a1s) :
Revision history for this message
Jelmer Vernooij (jelmer) :
lp://staging/~a1s/brz/3.2 updated
7567. By Aleksandr Smyshliaev

Fix issues discussed in https://code.launchpad.net/~a1s/brz/3.2/+merge/412781

7568. By Aleksandr Smyshliaev

Merge lp:brz/3.2

Revision history for this message
Aleksandr Smyshliaev (a1s) wrote :

Revision 7568 is not ready to be merged, sorry. It went OK on Windows, but then I found that it's broken on *nix. I'm going to fix it and make another commit in a day or two.

lp://staging/~a1s/brz/3.2 updated
7569. By Aleksandr Smyshliaev

Add win32utils.list_fs_types()

7570. By Aleksandr Smyshliaev

Fix regression on *nix

Revision history for this message
Aleksandr Smyshliaev (a1s) wrote :

Ok, now this is tested on Linux/Python 3.10. Both test_config and test_osutils run without errors.

On Windows, test_config runs without errors, and test_osutils has two failures in test_osutils.Test_CICPCanonicalRelpath. Those I want to leave for another time.

I've replied to all questions asked here in diff comments.

Please check if this can be merged now.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

It would still be useful to split this merge proposal into several separate ones, e.g. one with the filesystem type changes, one with the symlink changes, one with the config changes, one with the walkdir fixes, etc.

Revision history for this message
Aleksandr Smyshliaev (a1s) wrote :

> It would still be useful to split this merge proposal into several separate
> ones, e.g. one with the filesystem type changes, one with the symlink changes,
> one with the config changes, one with the walkdir fixes, etc.

I surely see the point in submitting each atomic change in a different merge proposal.

The problem is, I'm not sure the regression would run with just one of those things changed and others left as is. Perhaps I would try that if the merge proposals are reviewed in hours, not weeks.

At the moment, my first priority is getting qbrz work on Linux, and then I'm going to take a pause to handle my RL issues. I'd really like to have Breezy working on Windows, but right now Bazaar 2.6 covers my needs there.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

> > It would still be useful to split this merge proposal into several separate
> > ones, e.g. one with the filesystem type changes, one with the symlink
> changes,
> > one with the config changes, one with the walkdir fixes, etc.
>
> I surely see the point in submitting each atomic change in a different merge
> proposal.
>
> The problem is, I'm not sure the regression would run with just one of those
> things changed and others left as is. Perhaps I would try that if the merge
> proposals are reviewed in hours, not weeks.
The delay in reviews is actually a function of the size of the merge proposals; for the smaller ones that are easy to understand the full implications of, I usually just process them as part of my regular email reading but for larger ones I need to schedule some time to sit down and understand them.

Jelmer

Revision history for this message
Aleksandr Smyshliaev (a1s) wrote :

I do understand. I'm sorry there are too many things to address at once.

lp://staging/~a1s/brz/3.2 updated
7571. By Aleksandr Smyshliaev

Merge lp:brz/3.2

7572. By Aleksandr Smyshliaev

Merge lp:brz/3.2

Unmerged revisions

7572. By Aleksandr Smyshliaev

Merge lp:brz/3.2

7571. By Aleksandr Smyshliaev

Merge lp:brz/3.2

7570. By Aleksandr Smyshliaev

Fix regression on *nix

7569. By Aleksandr Smyshliaev

Add win32utils.list_fs_types()

7568. By Aleksandr Smyshliaev

Merge lp:brz/3.2

7567. By Aleksandr Smyshliaev

Fix issues discussed in https://code.launchpad.net/~a1s/brz/3.2/+merge/412781

7566. By Aleksandr Smyshliaev

Use relative import paths in test__walkdirs_win32

7565. By Aleksandr Smyshliaev

Get rid of osutils.open_file: in Python 3.4 and newer file descriptors are non-inheritable by default

7564. By Aleksandr Smyshliaev

Merge brz/3.2

7563. By Aleksandr Smyshliaev

Fix regression tests run by selftest test_config on Windows

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches