darcs

Patch 1332 Generalize Darcs.UI.Commands.Dist.doFastZip

Title Generalize Darcs.UI.Commands.Dist.doFastZip
Superseder Nosy List DaniilFrumin, ganesh, gh
Related Issues
Status accepted Assigned To ganesh
Milestone 2.10.1

Created on 2015-05-07.14:20:29 by DaniilFrumin, last changed 2015-06-12.16:00:33 by gh.

Files
File name Status Uploaded Type Edit Remove
fastzip.dpatch DaniilFrumin, 2015-05-07.14:20:28 application/octet-stream
fix-the-previous-dofastzip-patch.dpatch DaniilFrumin, 2015-06-07.21:23:28 application/octet-stream
fix-warning.dpatch ganesh, 2015-06-08.06:46:45 application/x-darcs-patch
generalize-darcs_ui_commands_dist_dofastzip.dpatch dead DaniilFrumin, 2015-06-07.18:43:20 application/octet-stream
patch-preview.txt ganesh, 2015-06-08.06:46:45 text/x-darcs-patch
unnamed DaniilFrumin, 2015-05-29.17:03:29 text/html
unnamed DaniilFrumin, 2015-06-07.18:43:20 text/html
unnamed DaniilFrumin, 2015-06-07.21:23:28 text/html
unnamed ganesh, 2015-06-08.06:46:45
See mailing list archives for discussion on individual patches.
Messages
msg18395 (view) Author: DaniilFrumin Date: 2015-05-07.14:20:28
The new doFastZip' function can now create zip archives from arbitrary
located repositories; does not write the result to the file immediately.

You can pull the patch from my DarcsDen repository:
http://hub.darcs.net/co-dan/darcs-soc/patch/20150507135812-21ae5
Attachments
msg18398 (view) Author: ganesh Date: 2015-05-07.21:42:55
This should go into the 2.10 branch so darcsden can use it
msg18408 (view) Author: ganesh Date: 2015-05-29.10:32:54
Actually, this breaks the dist.sh test. Daniil, could you check that?

Apologies for not looking at this patch earlier btw.
msg18415 (view) Author: DaniilFrumin Date: 2015-05-29.17:03:29
Hm, actually it works fine for me:

~/p/d/darcs-soc ❯❯❯ ./dist/build/darcs-test/darcs-
test
--tests=dist.sh

Using darcs executable in
/Users/dan/projects/darcs/darcs-soc/dist/build/darcs/darcs
Locale encoding is UTF-8

dist.sh (Darcs2) (PatienceDiff): [Success]

issue1269_setpref_predist.sh (Darcs2) (PatienceDiff): [Success]

         Shell       Total
 Passed  2           2
 Failed  0           0
 Total   2           2

What exact sequence of patches are you using, and what system are you on?

On Fri, May 29, 2015 at 12:32 PM, Ganesh Sittampalam <bugs@darcs.net> wrote:

>
> Ganesh Sittampalam <ganesh@earth.li> added the comment:
>
> Actually, this breaks the dist.sh test. Daniil, could you check that?
>
> Apologies for not looking at this patch earlier btw.
>
> ----------
> assignedto: gh -> DaniilFrumin
> milestone: 2.10.0 ->
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/patch1332>
> __________________________________
>



-- 
Sincerely yours,
-- Daniil
Attachments
msg18416 (view) Author: ganesh Date: 2015-05-30.13:13:28
This is where it goes wrong - note that it's conditional on 'unzip' being present:

    | # Only do following if unzip is present
    | unzip >& /dev/null &&
    | (
    | unzip temp1.zip
    | diff -r temp_orig temp1
    | rm -rf temp1
    | )
    | + unzip
    | + unzip temp1.zip
    | :  mismatching "local" filename (file-4),
    |          continuing with "central" filename version
    | mapname:  conversion of  failed

I'm running NixOS (commit 37e2733) and I've got this:

    $ unzip -v
    UnZip 6.00 of 20 April 2009, by Info-ZIP.

I suspect it's because we're now creating paths starting "./foo" where they were previously "foo".
msg18424 (view) Author: DaniilFrumin Date: 2015-06-07.18:43:20
I think I might have figured it out. Here is an updated patch. It also
fixes another mistake in the previous patch: the message ("Created ...zip")
was erroneously omitted.


On Sat, May 30, 2015 at 3:13 PM, Ganesh Sittampalam <bugs@darcs.net> wrote:

>
> Ganesh Sittampalam <ganesh@earth.li> added the comment:
>
> This is where it goes wrong - note that it's conditional on 'unzip' being
> present:
>
>     | # Only do following if unzip is present
>     | unzip >& /dev/null &&
>     | (
>     | unzip temp1.zip
>     | diff -r temp_orig temp1
>     | rm -rf temp1
>     | )
>     | + unzip
>     | + unzip temp1.zip
>     | :  mismatching "local" filename (file-4),
>     |          continuing with "central" filename version
>     | mapname:  conversion of  failed
>
> I'm running NixOS (commit 37e2733) and I've got this:
>
>     $ unzip -v
>     UnZip 6.00 of 20 April 2009, by Info-ZIP.
>
> I suspect it's because we're now creating paths starting "./foo" where
> they were previously "foo".
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/patch1332>
> __________________________________
>
Attachments
msg18425 (view) Author: ganesh Date: 2015-06-07.20:18:58
The old patch is already applied, so please could you make the new one 
a follow-on rather than an amendment?
msg18427 (view) Author: DaniilFrumin Date: 2015-06-07.21:23:28
Oops, sorry for that.

On Sun, Jun 7, 2015 at 10:18 PM, Ganesh Sittampalam <bugs@darcs.net> wrote:

>
> Ganesh Sittampalam <ganesh@earth.li> added the comment:
>
> The old patch is already applied, so please could you make the new one
> a follow-on rather than an amendment?
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/patch1332>
> __________________________________
>
Attachments
msg18429 (view) Author: ganesh Date: 2015-06-08.06:46:45
1 patch for repository darcs-unstable@darcs.net:screened:

Mon Jun  8 07:44:49 BST 2015  Ganesh Sittampalam <ganesh@earth.li>
  * fix warning
Attachments
msg18430 (view) Author: ganesh Date: 2015-06-08.17:28:43
Looks good now, thanks!
msg18462 (view) Author: gh Date: 2015-06-12.16:00:33
I'm pushing the 3 patches into branch 2.10.

2015-06-08 14:28 GMT-03:00 Ganesh Sittampalam <bugs@darcs.net>:
>
> Ganesh Sittampalam <ganesh@earth.li> added the comment:
>
> Looks good now, thanks!
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/patch1332>
> __________________________________
History
Date User Action Args
2015-05-07 14:20:29DaniilFrumincreate
2015-05-07 21:42:55ganeshsetmessages: + msg18398
milestone: 2.10.0
2015-05-27 21:03:03ganeshsetassignedto: gh
nosy: + gh
2015-05-29 10:32:55ganeshsetassignedto: gh -> DaniilFrumin
messages: + msg18408
milestone: 2.10.0 -> (no value)
2015-05-29 10:33:10ganeshsetstatus: needs-screening -> followup-requested
2015-05-29 17:03:30DaniilFruminsetfiles: + unnamed
messages: + msg18415
2015-05-30 13:13:29ganeshsetmessages: + msg18416
2015-06-07 18:43:21DaniilFruminsetfiles: + unnamed, generalize-darcs_ui_commands_dist_dofastzip.dpatch
messages: + msg18424
2015-06-07 20:18:59ganeshsetmessages: + msg18425
2015-06-07 21:23:29DaniilFruminsetfiles: + unnamed, fix-the-previous-dofastzip-patch.dpatch
messages: + msg18427
2015-06-08 06:46:44ganeshsetstatus: followup-requested -> review-in-progress
assignedto: DaniilFrumin -> ganesh
milestone: 2.10.1
nosy: + ganesh
2015-06-08 06:46:45ganeshsetfiles: + patch-preview.txt, fix-warning.dpatch, unnamed
messages: + msg18429
2015-06-08 17:28:20ganeshsetstatus: review-in-progress -> accepted-pending-tests
2015-06-08 17:28:43ganeshsetmessages: + msg18430
2015-06-09 05:46:45ganeshsetstatus: accepted-pending-tests -> accepted
2015-06-12 16:00:33ghsetmessages: + msg18462