As David points out, the ChangeLog should really just say the most
important things, so feel free to trim (or to add entries!)
Only 218 patches to go.
Fri Jun 13 17:17:42 BST 2008 Eric Kow <[EMAIL PROTECTED]>
* Support comments on ignored changelog entries.
Parsec wibble: the problem was that it would start parsing the
emptyLine as a 'match' and not backtrack.
Fri Jun 13 17:22:13 BST 2008 Eric Kow <[EMAIL PROTECTED]>
* Ignore tags in make_changelog warning about unlogged patches.
Fri Jun 13 17:25:37 BST 2008 Eric Kow <[EMAIL PROTECTED]>
* Clarify intent of ignored changelog entries.
Fri Jun 13 17:57:29 BST 2008 Eric Kow <[EMAIL PROTECTED]>
* More changelog entries for 2.0.1.
New patches:
[Support comments on ignored changelog entries.
Eric Kow <[EMAIL PROTECTED]>**20080613161742
Parsec wibble: the problem was that it would start parsing the
emptyLine as a 'match' and not backtrack.
] hunk ./src/make_changelog.hs 164
padding p = text . take p . repeat $ ' '
entry :: CharParser st (ChangeLogEntry p)
-entry = matchEntry <|> ignoreEntry
+entry =
+ do emptyLine
+ e <- matchEntry <|> ignoreEntry
+ emptyLine
+ return e
ignoreEntry :: CharParser st (ChangeLogEntry p)
ignoreEntry = do
hunk ./src/make_changelog.hs 172
- emptyLine
patterns <- many1 $ do
try (string "ignore:")
startPos <- getPosition
hunk ./src/make_changelog.hs 186
setParserState endState
newline
return (make_matcher s m)
- emptyLine
return (patterns, Nothing)
matchEntry :: CharParser st (ChangeLogEntry p)
hunk ./src/make_changelog.hs 190
matchEntry = do
- emptyLine
patterns <- many1 $ do
try (string "match:")
startPos <- getPosition
hunk ./src/make_changelog.hs 211
cs <- restOfLine
newline
return cs
- emptyLine
return (patterns, Just $ formatEntry descr)
emptyLine :: CharParser st ()
[Ignore tags in make_changelog warning about unlogged patches.
Eric Kow <[EMAIL PROTECTED]>**20080613162213] hunk ./src/make_changelog.hs 25
import Darcs.Patch.Match ( match_parser, match_pattern, apply_matcher, Matcher,
make_matcher )
import Darcs.Patch.MatchData ( PatchMatch(..) )
-import Darcs.Patch.Info ( PatchInfo, just_name, just_author, pi_date, human_friendly )
+import Darcs.Patch.Info ( PatchInfo, just_name, just_author, pi_date, pi_tag, human_friendly )
import Darcs.Patch.Ordered ( unsafeUnRL, concatRL )
import Darcs.Hopefully ( info )
import Darcs.Sealed ( liftSM )
hunk ./src/make_changelog.hs 31
import Data.Char ( isSpace )
-import Data.Maybe ( catMaybes, mapMaybe )
+import Data.Maybe ( catMaybes, mapMaybe, isNothing )
import Data.List ( intersperse, unfoldr )
import Text.ParserCombinators.Parsec
hunk ./src/make_changelog.hs 68
, renderDocs (mapMaybe snd unmatched)
]
- let unlogged = filter (\p -> not $ any (`apply_matcher` p) allpatterns) history
+ let unlogged = filter (\p -> not $ any (`apply_matcher` p) allpatterns)
+ . filter (isNothing . pi_tag . info) $ history
where allpatterns = concat $ map fst entries
hPutStr stderr $ concat
[ "\npatches which have not yet been changelogged\n\n"
[Clarify intent of ignored changelog entries.
Eric Kow <[EMAIL PROTECTED]>**20080613162537] hunk ./changelog.in/entries/ignored 1
+# Ignoring a patch just means that you won't get any warnings about
+# the patch not being changelogged. If you write a changelog entry for them,
+# they will still appear in the log.
+
+# patches before darcs 2.0.0
ignore: date "before 2008-04-07 15:06:38Z"
ignore: name "typo"
[More changelog entries for 2.0.1.
Eric Kow <[EMAIL PROTECTED]>**20080613165729] hunk ./changelog.in/entries/ignored 12
ignore: name "Canonize"
+ignore: name "^bump version number"
+
+ignore: name "configure\.ac"
+ignore: name "aclocal\.m4"
+ignore: name "makefile"
hunk ./changelog.in/entries/kowey 1
-ignore: exact "Replace presumably non-portable use of fgrep in issue864 bug"
-ignore: exact "Fix import warnings for Windows"
+# ----------------------------------------------------------------------
+# ignored
+# ----------------------------------------------------------------------
+
+# code quality
ignore: exact "eliminate duplicate get_remote_repo in favor of list comprehensions."
hunk ./changelog.in/entries/kowey 7
+ignore: exact "Fix import warnings for Windows."
ignore: exact "fix up website for new release."
hunk ./changelog.in/entries/kowey 9
+ignore: exact "Rename ColourPrinter to ColorPrinter."
+ignore: exact "Replace colour by color to uniformise a bit."
hunk ./changelog.in/entries/kowey 12
-match: exact "add --count output option to changes."
-> New Feature: darcs changes --count (David Roundy)
+# website
+ignore: exact "update README url links"
+
+# makefile/configure
+ignore: exact "remove unused GHC_LIBDIR"
+
+# test suite
+ignore: exact "Add failing test for issue870."
+ignore: exact "Check for bash before running shell tests."
+ignore: exact "fix test for windows (maybe?)"
+ignore: exact "fix URL in network test."
+ignore: exact "Generalise test for rollback with no changes."
+ignore: exact "make test suite smarter about cleaning up test directories."
+ignore: exact "Move issue855 bug to tests."
+ignore: exact "Replace presumably non-portable use of fgrep in issue864 bug"
+ignore: exact "resolve Issue832: quote all instances of \"$DARCS\", \"$ACTUAL_DARCS\", \"$PWD\", and \"$HOME\" in the sh tests and test harness, as well as all other shell variables that get expanded in test scripts (a cursory glance suggested that none of them were actually intended to be split on whitespace and so are probably best quoted)."
+ignore: exact "resolve issue870: it was a bug in the test script."
+ignore: exact "simplify setpref.sh"
+ignore: exact "translate pull.pl into shell."
+ignore: exact "try a bit harder to identify windows systems in perl tests."
+ignore: exact "Undo overoptimistic move of issue855 bug to tests."
+ignore: exact "simplify init_tmp_repo."
+ignore: name "shell_harness"
+ignore: name "perl harness"
+
+# oops command
+ignore: exact "resolve issue786: implement oops command."
+ignore: exact "roll back implementation of joke oops command."
+
+# administrative
+ignore: exact "Add ability to ignore patches for ChangeLog."
+ignore: exact "Add 'ignored' changelog entries (no warnings)."
+ignore: exact "ChangeLog entries by Eric."
+ignore: exact "Clarify intent of ignored changelog entries."
+ignore: exact "Exceptions to GPL granted as of 2008-06-13 morning."
+ignore: exact "Ignore tags in make_changelog warning about unlogged patches."
+ignore: exact "Resolve issue705: warn about patches which are not changelogged."
+ignore: exact "Support comments on ignored changelog entries."
+
+# other
+ignore: exact "English: only use singular for 1 (we have 0 foos, but 1 bar, and 2 quuxes)"
+
+# ----------------------------------------------------------------------
+# bug fixes
+# ----------------------------------------------------------------------
+
+match: exact "resolve Issue817: fix bug in conflict-handling with darcs-2 semantics."
+> Bug Fix: Conflict-handling with darcs-2 semantics (issue817, David Roundy)
match: exact "Add test for case-insensitive backup bug."
match: exact "Fix a backup bug on case-insensitive file systems."
hunk ./changelog.in/entries/kowey 66
> Bug Fix: Avoid a error caused by renaming a file on
> case-insensitive file-systems (Eric Kow)
-match: exact "Check for bash before running shell tests."
-> Internal: Improvements running test suite on Windows (David
-> Roundy, Eric Kow)
+match: exact "resolve issue385: don't worry if we can't get local changes."
+match: exact "add test for issue385."
+> Bug Fix: Make changes --repo work when not in a repository (David
+> Roundy)
+
+match: exact "Fix UI bug in rollback."
+> Bug Fix: Do not rollback if no primitive patches were selected (issue870,
+> Eric Kow)
+
+# ----------------------------------------------------------------------
+# performance
+# ----------------------------------------------------------------------
match: exact "Resolve issue913: Use Data.Bytestring for IO, not Data.Bytestring.Char8"
match: exact "rearrange bytestring tests so if it's not present we're quieter."
hunk ./changelog.in/entries/kowey 87
> Performance: Faster strings, using Data.Bytestring
> by default (Gwern Branwen, Eric Kow, Ian Lynagh, David Roundy)
+match: exact "optimized get --to-match handling for darcs 1 repositories"
+> Performance: optimized get --to-match handling for darcs 1
+> repositories (Reinier Lamers)
+
+# ----------------------------------------------------------------------
+# features and ui
+# ----------------------------------------------------------------------
+
+match: exact "add --count output option to changes."
+> New Feature: darcs changes --count (David Roundy)
+
match: exact "simplify determine_release_state.pl."
match: exact "make determine_release_state.pl use changes --count."
match: exact "automatically work out the version of the stable release."
hunk ./changelog.in/entries/kowey 104
> New Feature: Include patch count in darcs --version, for
> example darcs 2.0.1 (2.0.1 + 32 patches) (David Roundy)
-match: exact "resolve issue795: Make 'darcs changes -i' behave more like other jobs."
-match: exact "Undo a false refactor in SelectChanges."
-match: exact "Correct changes -i help message."
-match: exact "resolve issue827: correct changes -i behaviour"
-> User Experience: Make darcs changes --interactive behave more like
-> other interactive commands (Eric Kow)
-
-match: exact "optimized get --to-match handling for darcs 1 repositories"
-> Performance: optimized get --to-match handling for darcs 1
-> repositories (Reinier Lamers)
-
-match: exact "Replace colour by color to uniformise a bit."
-match: exact "Rename ColourPrinter to ColorPrinter."
-> Internal: Standardize code and comments on American spelling
-> (Nicolas Pouillard, Eric Kow)
-
match: exact "default to not coloring hunks."
match: exact "Use the lineColoring to prettify hunks with colors."
match: exact "Add line coloring support in Printer and ColourPrinter."
hunk ./changelog.in/entries/kowey 110
match: exact "Export Printer.(<?>)."
match: exact "Add two colors (cyan and magenta), but not use them yet."
match: exact "Refactor a little the color handling."
-> User Experience: Colorize added and removed lines, if the
+> New Feature: Colorize added and removed lines, if the
> environment variable DARCS_DO_COLOR_LINES=True (Nicolas Pouillard)
hunk ./changelog.in/entries/kowey 113
-match: exact "resolve issue385: don't worry if we can't get local changes."
-match: exact "add test for issue385."
-> Bug Fix: Make changes --repo work when not in a repository (David
-> Roundy)
+match: exact "resolve issue795: Make 'darcs changes -i' behave more like other jobs."
+match: exact "Undo a false refactor in SelectChanges."
+match: exact "Correct changes -i help message."
+match: exact "resolve issue827: correct changes -i behaviour"
+> User Experience: Make darcs changes --interactive behave more like
+> other interactive commands (Eric Kow)
+
+match: exact "Resolve issue738: When pushing, remind user of patches to pull."
+> User Experience: When pushing, prints a small reminder when
+> the remote repository has patches to pull (Eric Kow, David Roundy)
hunk ./changelog.in/entries/kowey 124
-match: exact "Zapped bash-ism from configure.ac."
-match: exact "Not using awk in configure.ac"
-> Internal: Improved configure/make portability (Pekka Pessi)
+# ----------------------------------------------------------------------
+# other
+# ----------------------------------------------------------------------
match: exact "doc updates"
match: exact "remove git section from building_darcs.tex"
Context:
[ChangeLog entries by Eric.
Eric Kow <[EMAIL PROTECTED]>**20080613151200
Some ChangeLog entries for 2.0.1
]
[Add 'ignored' changelog entries (no warnings).
Eric Kow <[EMAIL PROTECTED]>**20080613150620]
[Resolve issue705: warn about patches which are not changelogged.
Eric Kow <[EMAIL PROTECTED]>**20080613145443
Mostly by Tommy Pettersson.
]
[Add ability to ignore patches for ChangeLog.
Eric Kow <[EMAIL PROTECTED]>**20080613142540
This would be useful if make_changelog could point out which patches
are not being changelogged.
]
[Exceptions to GPL granted as of 2008-06-13 morning.
Eric Kow <[EMAIL PROTECTED]>**20080613072749]
[Add test for case-insensitive backup bug.
Eric Kow <[EMAIL PROTECTED]>**20080613070918]
[Fix a backup bug on case-insensitive file systems.
Eric Kow <[EMAIL PROTECTED]>**20080613070213
Avoids this scenario. The task: move foo to FOO and modify FOO
1. FOO (foo) already exists, so I'll back it up
(moves FOO [foo] to FOO.darcs-backup0)
2. Now I can move foo to FOO
foo no longer exists, but that's ok
(nothing happens)
3. Now I can FOO
hey, where did FOO go?
(crash!)
]
[Check for bash before running shell tests.
Eric Kow <[EMAIL PROTECTED]>**20080612145509
MSYS, for instance, does not provide bash by default.
[note: or rather, only under the guise of sh.exe]
]
[TAG 2.0.1rc2
David Roundy <[EMAIL PROTECTED]>**20080613011745]
[bump version number up to 2.0.1rc2.
David Roundy <[EMAIL PROTECTED]>**20080613011731]
[Resolve issue913: Use Data.Bytestring for IO, not Data.Bytestring.Char8
Eric Kow <[EMAIL PROTECTED]>**20080612125719
This solution comes from Ian Lynagh, who points out that the
difference between the two is:
Data.Bytestring.Char8
---------------------
writeFile :: FilePath -> ByteString -> IO ()
writeFile f txt = bracket (openFile f WriteMode) hClose
(\h -> hPut h txt)
Data.Bytestring
---------------
writeFile :: FilePath -> ByteString -> IO ()
writeFile f txt = bracket (openBinaryFile f WriteMode) hClose
(\h -> hPut h txt)
We want this change because, as the System.IO docs say:
On Windows, reading a file in text mode (which is the default) will
translate CRLF to LF, and writing will translate LF to CRLF. This is
usually what you want with text files. With binary files this is
undesirable; also, as usual under Microsoft operating systems, text
mode treats control-Z as EOF. Binary mode turns off all special
treatment of end-of-line and end-of-file characters.
]
[fix OPTLLIBS filtering
Karel Gardas <[EMAIL PROTECTED]>**20080607210701]
[Darcs.Repository.Prefs: +boring filters for MS Visual Studio (see -users discussion)
[EMAIL PROTECTED]
[Demonstrate 'hidden conflicts' bug (old format).
Eric Kow <[EMAIL PROTECTED]>**20080606151534]
[fix regression introduced by using Data.List.isInfixOf.
David Roundy <[EMAIL PROTECTED]>**20080606102519]
[fix bug in test when there's a space in test directory.
David Roundy <[EMAIL PROTECTED]>**20080605151104]
[translate pull.pl into shell.
David Roundy <[EMAIL PROTECTED]>**20080605124106]
[make test suite smarter about cleaning up test directories.
David Roundy <[EMAIL PROTECTED]>**20080605124025]
[darcs put now support --{no-,}set-default.
Nicolas Pouillard <[EMAIL PROTECTED]>**20080604214551]
[fix regression in index.html.in.
David Roundy <[EMAIL PROTECTED]>**20080605114356]
[resolve issue783: propose 'edit' as a default Windows editor
Eric Kow <[EMAIL PROTECTED]>**20080605165812
I think every Windows box has this. Advantages over notepad are that
- it's a console app
- it appears to support Unix newlines
]
[Makefile: prefix -optl only on $(LIBS) that start with '-'
Eric Kow <[EMAIL PROTECTED]>**20080605105539
Otherwise, on Windows, if you try to build --with-static-libs, the
linker will be passed /usr/local/lib/libcurl.a as an argument, which
makes gcc complain.
]
[resolve issue770: catch 'does not exist' when running external programs
Eric Kow <[EMAIL PROTECTED]>**20080604143100
Convert these errors into ExitCode 127 (for Windows)
]
[TAG 2.0.1rc1
David Roundy <[EMAIL PROTECTED]>**20080603124331]
Patch bundle hash:
52f8dd80c35f3558b27ea3583bee409504bcc426
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
