gmane.comp.version-control.darcs.devel

[patch820] make darcs apply work with url

Guillaume Hoffmann — 2012-05-25T01:58:07

Guillaume Hoffmann <guillaumh< at >gmail.com> added the comment:

fixUrl cannot be equivalent to fixFilePathOrStd on non-URLs since
it doesn't handle the stdin case.

When not given an URL, fixUrl calls fixFilePath. I'm not really
motivated in writing a QC for that. I'm sending a haddock for fixUrl.

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch820>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel

[issue2179] darcs diff no longer works when givendirectory path

Guillaume Hoffmann — 2012-05-21T19:20:06

Guillaume Hoffmann <guillaumh< at >gmail.com> added the comment:

Fixed by http://bugs.darcs.net/patch818.

----------
status: unknown -> resolved

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/issue2179>
__________________________________

Re: [issue1609] darcs conflict marking gives different results in different orders (OT TP2)

Florent Becker — 2012-05-21T12:17:51

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Le 20/05/2012 22:58, Guillaume Hoffmann a écrit :
I think it's an artifact of the fact that this test does not use the
return value of the first diff, which is still non-empty.

Florent

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+6MmwACgkQTCPcDztjGo6nYACfU4FbDsUkGfbhlZ4UKiMEzBwk
x+sAnibYku1J99C08pDiTZqi9hE9Psbw
=Ysco
-----END PGP SIGNATURE-----

[issue1609] darcs conflict marking gives differentresults indifferent orders (OT TP2)

Guillaume Hoffmann — 2012-05-20T20:58:06

Guillaume Hoffmann <guillaumh< at >gmail.com> added the comment:

The test for this issue now pass, what happened?

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/issue1609>
__________________________________

[issue1609] darcs conflict marking gives differentresults indifferent orders (OT TP2)

Guillaume Hoffmann — 2012-05-20T20:37:14

Guillaume Hoffmann <guillaumh< at >gmail.com> added the comment:



__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/issue1609>
__________________________________

[patch820] make darcs apply work with url

Eric Kow — 2012-05-20T16:48:34

Eric Kow <kowey< at >darcs.net> added the comment:

looks good

I think maybe we need a QC that ensures fixUrl is equivalent to 
fixFilePathOrStd when not given a URL

----------
status: needs-review -> accepted-pending-tests

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch820>
__________________________________

[patch829] kill footnotes in manual and uninformativecommand-ove...

Guillaume Hoffmann — 2012-05-20T15:31:46

New submission from Guillaume Hoffmann <guillaumh< at >gmail.com>:

I'm going to self-accept this one since it's a documentation change.

1 patch for repository http://darcs.net:

Sun May 20 12:28:28 ART 2012  Guillaume Hoffmann <guillaumh< at >gmail.com>
  * kill footnotes in manual and uninformative command-overview paragraph

----------
files: kill-footnotes-in-manual-and-uninformative-command_overview-paragraph.dpatch, patch-preview.txt, unnamed
messages: 15707
nosy: gh
status: needs-screening
title: kill footnotes in manual and uninformative command-ove...

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch829>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel

Re: trouble with type witnesses

Michael Hendricks — 2012-05-19T02:51:39

Thank you Ganesh.  I don't think I'd ever seen the "replace with undefined"
trick.  Each step you describe makes sense.  Now that it compiles, I'll
continue working towards the goal.

Re: trouble with type witnesses

Ganesh Sittampalam — 2012-05-18T23:32:51

Some brief notes on my thought process on understanding this error. I'm
starting writing this email without knowing the answer, so we'll see if
I can get there before the need to go to bed overtakes me :-)

The specific error I get from GHC 7.4 is below. It seems to point to the
final clause of the case statement, so just to check I replaced the RHS
with undefined and now it compiles. So the problem must be there somewhere.

OK, so what's going on. The type signature of reduceContext says that
the end state of the PatchSet argument must be the start state of the FL
argument. At a quick glance that looks ok because what we have coming in
is the sequence

[ts :> ps :> p] :> [removed]
PatchSet           FL

(playing fast and loose with the operators, just identifying how the
contexts work)

and the commute should give us

[ts :> ps] :> [removed'] :> _ (thrown away)

But the type signature of reduceContext also says that the result of
reduceContext contains wT, which is the end context of the FL. And by
throwing away a patch in the list after commuting p :> removed, I think
that's being lost.

So next I'll try giving that thrown away patch a name p', and changing
removed' to (removed' +>+ (p' :>: NilFL)).

And that does seem to compile.

src\Darcs\Commands\Unrecord.hs:283:64:
    Could not deduce (wZ1 ~ wT)
    from the context (RepoPatch p)
      bound by the type signature for
                 reduceContext :: RepoPatch p =>
                                  PatchSet p Origin wZ
                                  -> FL (PatchInfoAnd p) wZ wT
                                  -> Integer
                                  -> (Sealed (PatchSet p Origin),
                                      FlippedSeal (FL (PatchInfoAnd p)) wT)
      at src\Darcs\Commands\Unrecord.hs:(275,1)-(283,77)
      `wZ1' is a rigid type variable bound by
            a pattern with constructor
              :> :: forall (a1 :: * -> * -> *) (a2 :: * -> * -> *) wX wY wZ.
                    a1 wX wZ -> a2 wZ wY -> (:>) a1 a2 wX wY,
            in a case alternative
            at src\Darcs\Commands\Unrecord.hs:283:15
      `wT' is a rigid type variable bound by
           the type signature for
             reduceContext :: RepoPatch p =>
                              PatchSet p Origin wZ
                              -> FL (PatchInfoAnd p) wZ wT
                              -> Integer
                              -> (Sealed (PatchSet p Origin),
                                  FlippedSeal (FL (PatchInfoAnd p)) wT)
           at src\Darcs\Commands\Unrecord.hs:275:1
    Expected type: FL (PatchInfoAnd p) wY wT
      Actual type: FL (PatchInfoAnd p) wY wZ
    In the second argument of `reduceContext', namely removed'
    In the expression: reduceContext (PatchSet ps ts) removed' (n - 1)


On 18/05/2012 23:14, Michael Hendricks wrote:

trouble with type witnesses

Michael Hendricks — 2012-05-18T22:14:20

I'm playing with a new --reduce-context option for send and obliterate
which commutes the target patch(es) to reduce the number of 
irrelevant patches in the context.

I've spent about 8 hours across two days trying different variations
to placate the type witnesses, but can't seem to get it working.
The third patch below is the important one.

Any pointers on what I'm doing wrong?

Thanks.

Thu Apr 26 16:32:40 MDT 2012  Michael Hendricks <michael< at >ndrix.org>
  * draft: notes about obliterate --reduce-context

Fri May  4 14:39:54 MDT 2012  Michael Hendricks <michael< at >ndrix.org>
  * draft: tidy some bundle-related Haddock

Fri May 18 16:05:47 MDT 2012  Michael Hendricks <michael< at >ndrix.org>
  * draft: working on 'obliterate --reduce-context'

[patch828] remove inventory code of optimize without--reorder flagsince it did nothing

Guillaume Hoffmann — 2012-05-18T22:04:27

New submission from Guillaume Hoffmann <guillaumh< at >gmail.com>:

According to the help of optimize:
    "The default optimization moves recent patches (those not included 
in
     the latest tag) to the `front' [..]"

Now try this:
    chmod u-w _darcs/hashed_inventory
    darcs optimize

darcs does not complain, while at some moment writing over the file
should fail!

Let us look at the temporary _darcs/tentative_hashed_inventory created 
by
the function optimizeInventory (comment out the 'renameFile' line of
HashedRepo.tentativeFinalizeChanges). The optimization does not happen,
it's easy to verify it with a simple example with two patches and a tag
that depends only on one patch (you can do obliterate -O on the tag and
 then apply it again to have the tag 'on top of' both patches in
hashed_inventory).

My conclusion is that the help messages and comments in the code are 
wrong:
it's "optimize --reorder" who does what we expected all along from 
optimize.
Only optimize --reorder does something useful.

So this patch kills:
    Darcs.Repository.Internal.optimizeInventory
    Darcs.Patch.Depends.optimizePatchSet
    Darcs.Patch.Depends.deepOptimizePatchSet

And it moves the doReorder function of Darcs.Commands.Optimize into
Darcs.Repository.Internals as reorderInventory. 

Also the patch cleans up the Optimize module, and --reorder now directly
calls HashedRepo.finalizeTentativeChanges instead of
finalizeRepositoryChanges.

All shell tests pass.

----------
files: remove-inventory-code-of-optimize-without-__reorder-flag-since-it-did-nothing.dpatch
messages: 15705
nosy: gh
status: needs-screening
title: remove inventory code of optimize without --reorder flag since it did nothing

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch828>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel

[patch825] Tidy/Style ShowAuthors

Michael Hendricks — 2012-05-18T19:13:50

Michael Hendricks <michael< at >ndrix.org> added the comment:

Looks good

----------
status: needs-review -> accepted

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch825>
__________________________________

[patch823] Add missing -f flag to rm in show-authorstest

Michael Hendricks — 2012-05-18T19:13:39

Michael Hendricks <michael< at >ndrix.org> added the comment:

The test failed on OS X, so I committed "Fix show-authors test on OS X" 
during review.

----------
status: needs-review -> accepted

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch823>
__________________________________

[patch822] Add rank to show authors

Michael Hendricks — 2012-05-18T19:13:14

Michael Hendricks <michael< at >ndrix.org> added the comment:

OK

----------
status: needs-review -> accepted

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch822>
__________________________________

[patch827] Adapt to tar 0.4.0.0 API changes

matt — 2012-05-18T17:32:55

New submission from matt <matt< at >mattcox.ca>:

Hello,

This patch handles the API churn in tar 0.4.0.0.

Matt

1 patch for repository http://darcs.net:

Fri May 18 11:52:34 EDT 2012  matt< at >mattcox.ca
  * Adapt to tar 0.4.0.0 API changes

----------
files: adapt-to-tar-0_4_0_0-api-changes.dpatch, patch-preview.txt, unnamed
messages: 15701
nosy: matt
status: needs-screening
title: Adapt to tar 0.4.0.0 API changes

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch827>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel

[patch826] Accept issue1959 unwritable cache shouldnot kill darcs

Owen Stephens — 2012-05-16T17:24:13

New submission from Owen Stephens <darcs< at >owenstephens.co.uk>:

1 patch for repository http://darcs.net:

Wed May 16 18:24:05 BST 2012  Owen Stephens <darcs< at >owenstephens.co.uk>
  * Accept issue1959 unwritable cache should not kill darcs

----------
files: accept-issue1959-unwritable-cache-should-not-kill-darcs.dpatch, patch-preview.txt, unnamed
messages: 15700
nosy: owst
status: needs-screening
title: Accept issue1959 unwritable cache should not kill darcs

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch826>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel

[patch825] Tidy/Style ShowAuthors

Owen Stephens — 2012-05-16T01:01:12

Owen Stephens <darcs< at >owenstephens.co.uk> added the comment:

Tidy up patch.
Depends on 822

----------
status: needs-screening -> needs-review

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch825>
__________________________________

[patch825] Tidy/Style ShowAuthors

Owen Stephens — 2012-05-16T01:00:00

New submission from Owen Stephens <darcs< at >owenstephens.co.uk>:

Missed a unsaved hunk in vim
1 patch for repository http://darcs.net:

Wed May 16 01:58:00 BST 2012  Owen Stephens <darcs< at >owenstephens.co.uk>
  * Tidy/Style ShowAuthors

----------
files: patch-preview.txt, tidy_style-showauthors.dpatch, unnamed
messages: 15698
nosy: owst
status: needs-screening
title: Tidy/Style ShowAuthors

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch825>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel

[patch824] Tidy/Style ShowAuthors

Owen Stephens — 2012-05-16T00:55:32

New submission from Owen Stephens <darcs< at >owenstephens.co.uk>:

1 patch for repository http://darcs.net:

Wed May 16 01:55:25 BST 2012  Owen Stephens <darcs< at >owenstephens.co.uk>
  * Tidy/Style ShowAuthors

----------
files: patch-preview.txt, tidy_style-showauthors.dpatch, unnamed
messages: 15697
nosy: owst
status: needs-screening
title: Tidy/Style ShowAuthors

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch824>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel

[patch823] Add missing -f flag to rm in show-authorstest

Owen Stephens — 2012-05-16T00:51:33

Owen Stephens <darcs< at >owenstephens.co.uk> added the comment:

depends on patch 822

----------
status: needs-screening -> needs-review

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch823>
__________________________________

[patch823] Add missing -f flag to rm in show-authorstest

Owen Stephens — 2012-05-16T00:50:26

New submission from Owen Stephens <darcs< at >owenstephens.co.uk>:

A trivial patch, I forgot a -f flag to rm.

1 patch for repository http://darcs.net:

Wed May 16 01:50:33 BST 2012  Owen Stephens <darcs< at >owenstephens.co.uk>
  * Add missing -f flag to rm in show-authors test

----------
files: add-missing-_f-flag-to-rm-in-show_authors-test.dpatch, patch-preview.txt, unnamed
messages: 15695
nosy: owst
status: needs-screening
title: Add missing -f flag to rm in show-authors test

__________________________________
Darcs bug tracker <bugs< at >darcs.net>
<http://bugs.darcs.net/patch823>
_________________________________________________________________________________
darcs-devel mailing list
darcs-devel< at >darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel