Thu Nov 17 15:51:12 CET 2005 Daniel Bünzli <[EMAIL PROTECTED]>
* Fix patch selection for command changes --context
Hello,
Please double check this, I'm really not into darcs' internals (but I really
want this feature). At least, the test suite succeeds. I briefly explain what I
did.
The patch that added the support for patch selection to --context is
> darcs changes -p 'context.*--to-patch' -v
Wed Dec 22 21:37:54 CET 2004 Anthony Towns <[email protected]>
* make darcs changes --context support --to-patch, etc
hunk ./Changes.lhs 210
- putDocLn $ changelog opts' $ get_changes_info [] []
+ putDocLn $ changelog opts' $ get_changes_info opts' []
The patch that broke the functionnality must be that one (i.e. the
latest that touched the lines).
> darcs changes -p 'fix bug #544' -v
Sun Oct 9 13:49:41 CEST 2005 David Roundy <[EMAIL PROTECTED]>
* fix bug #544, caused by outputing changes --context with escaping and
coloring.
hunk ./Changes.lhs 25
-import DarcsArguments ( DarcsFlag(Context, MachineReadable, HumanReadable,
+import DarcsArguments ( DarcsFlag(Context, MachineReadable,
hunk ./Changes.lhs 45
-import Printer ( Doc, putDocLnWith, renderPS, renderString, prefix,
+import Printer ( Doc, putDocLnWith, simplePrinters, renderPS,
+ renderString, prefix,
hunk ./Changes.lhs 219
- putDocLnWith fancyPrinters $ changelog opts' $ get_changes_info opts'
[]
- [head $ slightly_optimize_patchset r]
- where opts' = if HumanReadable `elem` opts || XMLOutput `elem` opts
- then opts
- else MachineReadable : opts
+ putDocLnWith simplePrinters $ changelog [MachineReadable] $
+ get_changes_info [MachineReadable] []
+ [head $ slightly_optimize_patchset r]
My patches restores the functionnality by just passing 'MachineReadable : opts'
to 'changelog' and 'get_changes_info'. I hope its the right way to do it. At
least it seems to works here.
Daniel
New patches:
[Fix patch selection for command changes --context
Daniel Bünzli <[EMAIL PROTECTED]>**20051117145112]
<
> {
hunk ./Changes.lhs 219
r <- identifyRepository (get_repodir opts) >>= read_repo
putStrLn "\nContext:\n"
when (not $ null r || null (head r)) $
- putDocLnWith simplePrinters $ changelog [MachineReadable] $
- get_changes_info [MachineReadable] []
+ putDocLnWith simplePrinters $ changelog opts' $
+ get_changes_info opts' []
[head $ slightly_optimize_patchset r]
hunk ./Changes.lhs 222
+ where opts' = MachineReadable : opts
\end{code}
}
Context:
[English and markup fixes.
Dave Love <[EMAIL PROTECTED]>**20051114224845]
[update web page to reflect 1.0.4 as latest stable source.
David Roundy <[EMAIL PROTECTED]>**20051113210144]
[TAG 1.0.4
David Roundy <[EMAIL PROTECTED]>**20051113134431]
Patch bundle hash:
d934302447093438331ef20f734ee2cc65c447f5
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
