[darcs-users] [patch348] Remove -o and -O options from obliterate

[Reinier Lamers]

New submission from Reinier Lamers <tux_rocker at reinier.de>:

These patches are intended for the 2.5 branch. They remove support for the
-o and -O options for obliterate, as they are not stable yet.

Reinier

----------
files: remove-output-options-of-obliterate.dpatch
messages: 12188
nosy: tux_rocker
status: needs-review
title: Remove -o and -O options from obliterate

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch348>
__________________________________
-------------- next part --------------
These patches are intended for the 2.5 branch. They remove support for the
-o and -O options for obliterate, as they are not stable yet.

1 patch for repository http://darcs.net/releases/branch-2.5:

Sun Aug 15 19:00:25 CEST 2010  Reinier Lamers <tux_rocker at reinier.de>
  * Remove support for obliterate -o and obliterate -O


New patches:

[Remove support for obliterate -o and obliterate -O
Reinier Lamers <tux_rocker at reinier.de>**20100815170025
 Ignore-this: 3526e08931101d98300bb48b8a142dd0
] hunk ./src/Darcs/Commands/Unrecord.lhs 289
                                                    depsSel,
                                                    allInteractive,
                                                    workingRepoDir,
-                                                   summary,
-                                                   output,
-                                                   outputAutoName]++
+                                                   summary]++
                                                    dryRun}
 obliterateCmd :: [DarcsFlag] -> [String] -> IO ()
 obliterateCmd = genericObliterateCmd "obliterate"
hunk ./tests/issue1909-unrecord-O-misses-tag.sh 1
-#!/usr/bin/env bash
-## issue1909: unrecord -O in tagged repo makes a busted bundle
-
-. lib
-
-rm -rf R
-mkdir R
-darcs init --repo R
-echo a > R/a
-darcs rec -lam a --repo R --ignore-times
-darcs tag -m T --repo R
-echo b > R/a
-darcs rec -lam b --repo R --ignore-times
-echo c > R/a
-darcs rec -lam c --repo R --ignore-times
-
-darcs unpull -p c -a --repo R -O
-cat c.dpatch
-grep '^\[b' c.dpatch
-grep TAG c.dpatch
rmfile ./tests/issue1909-unrecord-O-misses-tag.sh

Context:

[Resolve issue1909: generate correct context in unpull -O.
Petr Rockai <me at mornfall.net>**20100807171552
 Ignore-this: 8d66f660e691ffe76a8da1eab9e5dcc9
] 
[Accept issue1909: unrecord -O in a tagged repo makes a bad bundle.
Petr Rockai <me at mornfall.net>**20100807171245
 Ignore-this: d8b2d7563cd4612814a209a515358cb4
] 
[Also set binary mode on stderr (duplicate for 2.5 branch)
Reinier Lamers <tux_rocker at reinier.de>**20100810193256
 Ignore-this: 5f1ed1efaff91967b340cfc51afa6ac5
] 
[Do not fail when there's debris in tests directory.
Petr Rockai <me at mornfall.net>**20100807192133
 Ignore-this: d1fdf93fbed39e3a20bb8d4129dbd4d4
] 
[Restyle issue1873 test and make it run in darcs 2.4.
Eric Kow <kowey at darcs.net>**20100807171741
 Ignore-this: 32d1c90bbb45ab91fd3803dc513bc751
 Just to confirm the regression...
] 
[Resolve issue1892: Improve safety of makeBundle* and fix a couple of related bugs.
Petr Rockai <me at mornfall.net>**20100715093842
 Ignore-this: 9eaa26edfdda09ac444f124130b9e74b
] 
[Remove [DarcsFlag] usage from Darcs.Patch.Bundle.
Petr Rockai <me at mornfall.net>**20100715081908
 Ignore-this: 62297671dea56fdc0a1cac42f79d6d29
] 
[Resolve issue1873: give nicer error when apply fails due to missing patches.
Petr Rockai <me at mornfall.net>**20100804204010
 Ignore-this: b3ddfddeaa7e089717256aa2344ba78c
] 
[remove dead code
Ganesh Sittampalam <ganesh at earth.li>**20100708055640
 Ignore-this: 86104cf3f14952869be820f66f156fbb
] 
[Add test for issue1873 (failed to read patch during apply).
Petr Rockai <me at mornfall.net>**20100807163013
 Ignore-this: 2396ff7f429204f6f10079fb32799e32
] 
[Rename findCommonAndUncommon to findUncommon (it does not find common).
Petr Rockai <me at mornfall.net>**20100804195738
 Ignore-this: 8257db493418179be45fad17ab6ffd8e
] 
[Export usageHelper
Joachim Breitner <mail at joachim-breitner.de>**20100803173150
 Ignore-this: 763398f4ab6b99a59de7666940103daa
 usage is darcs-specific, while usageHelper is not. ipatch could use
 usageHelper.
] 
[Make Darcs.RunCommand independent of Darcs.Commands.Help
Joachim Breitner <mail at joachim-breitner.de>**20100803165917
 Ignore-this: 744025a59cdd9ad52595b65d989a638a
 by passing commandControlList via main.hs. This allows re-use of
 Darcs.RunCommand by other binaries with a different set of commands.
] 
[Remove unused imports in Darcs.Commands.Changes
Reinier Lamers <tux_rocker at reinier.de>**20100802181249
 Ignore-this: 87d2c72fc74e4442f146d896296fb0db
] 
[Resolve issue1888: fix changes --context.
Petr Rockai <me at mornfall.net>**20100729185143
 Ignore-this: eed1a926b468492198547c438a85e2c9
] 
[TAG 2.4.98.2
Reinier Lamers <tux_rocker at reinier.de>**20100726184946
 Ignore-this: 43a9f17e811c2172be76fb1b19aa1497
] 
Patch bundle hash:
60fe5b08a280ca810f6d4b50d16a1c2054ec0413