Wed Aug 10 02:08:20 CEST 2005 Juliusz Chroboczek <[EMAIL PROTECTED]>
* Retain both Git's author and committer.
New patches:
[Retain both Git's author and committer.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050810000820] {
hunk ./Git.lhs 156
+gitCommitterHeader :: String
+gitCommitterHeader = "Git-Committer: "
+
hunk ./Git.lhs 160
-gitCommitToPatchInfo _ gc = patchinfo date name author darcs_log
- where (author, date) =
- parseAuthorLine (gitSingleCommitValue "committer" gc)
- name = head (lines comment)
- darcs_log = tail (lines comment)
- comment = snd gc
+gitCommitToPatchInfo _ gc =
+ let author = gitSingleCommitValue "author" gc
+ committer = gitSingleCommitValue "committer" gc
+ (darcs_author, darcs_date) = parseAuthorLine author
+ name = head (lines comment)
+ darcs_log' = tail (lines comment)
+ darcs_log = if (author == committer)
+ then darcs_log'
+ else (darcs_log' ++ [ gitCommitterHeader ++ committer ])
+ comment = snd gc
+ in patchinfo darcs_date name darcs_author darcs_log
hunk ./Git.lhs 658
+butlast :: [a] -> [a]
+butlast [] = impossible
+butlast [_] = []
+butlast (h:t) = h : (butlast t)
+
+parseGitCommitter :: String -> Maybe String
+parseGitCommitter s =
+ let (a, b) = splitAt (length gitCommitterHeader) s
+ in if (a == gitCommitterHeader)
+ then Just b
+ else Nothing
+
hunk ./Git.lhs 675
- (date, author, lg) <-
- case pinfo of
- (PatchInfo ct name author l _) ->
- return $ ((show $ formatGitTime $ unpackPS ct) ++
- " +0000",
- (unpackPS author),
- (unpackPS name) ++ "\n" ++
- (unlines (map unpackPS l)))
+ let (date, author, loglines) =
+ let (PatchInfo ct name auth l _) = pinfo
+ in ((show $ formatGitTime $ unpackPS ct) ++
+ " +0000",
+ (unpackPS auth),
+ (unpackPS name) : (map unpackPS l))
+ let (committer, lg) =
+ let mc = parseGitCommitter (last loglines)
+ in case mc of
+ (Just c) -> (c, unlines (butlast loglines))
+ Nothing -> (author, unlines loglines)
hunk ./Git.lhs 691
- "committer " ++ author ++ " " ++ date ++ "\n" ++
+ "committer " ++ committer ++ " " ++ date ++ "\n" ++
}
Context:
[make repair work on partial repositories.
David Roundy <[EMAIL PROTECTED]>**20050805113001]
[Cleanup --verbose handling in repair command
Matt Lavin <[EMAIL PROTECTED]>**20050805020630]
[clean up Printer.wrap_text.
David Roundy <[EMAIL PROTECTED]>**20050808114844]
[add several changelog entries.
David Roundy <[EMAIL PROTECTED]>**20050808114800]
[improve EOD message a tad.
David Roundy <[EMAIL PROTECTED]>**20050807112644
This change also introduces a "wrapped_text" function in Printer, so we
won't have to worry so often about manually wrapping lines.
]
[changed ***DARCS*** to ***END OF DESCRIPTION***
Jason Dagit <[EMAIL PROTECTED]>**20050729032543]
[remove unused opts argument from apply_patches and apply_patches_with_feedback
Matt Lavin <[EMAIL PROTECTED]>**20050807031038]
[Use apply_patch_with_feedback from check and repair commands
Matt Lavin <[EMAIL PROTECTED]>**20050805020830]
[add code to read patch bundles with added CRs.
David Roundy <[EMAIL PROTECTED]>**20050806222631
I think this'll address bug #291.
]
[accept command-line flags in any order.
David Roundy <[EMAIL PROTECTED]>**20050806211828
In particular, we no longer require that --flags precede filename and
repository arguments.
]
[show patch numbers instead of dots on get
Matt Lavin <[EMAIL PROTECTED]>**20050804013649]
[add obliterate command as alias for unpull.
David Roundy <[EMAIL PROTECTED]>**20050804104929]
[Do not ask confirmation for revert -a
[EMAIL PROTECTED]
Giving -a as a parameter means the user expects all changes to be reverted.
Just like for unrevert and record go ahead with it do not ask for confirmation.
]
[clarify help text for 'd' in SelectPatches.
David Roundy <[EMAIL PROTECTED]>**20050806231117]
[Add --with-static-libs configure flag for linking static versions of libraries.
[EMAIL PROTECTED]
[add changelog entry for bug #477.
David Roundy <[EMAIL PROTECTED]>**20050806212148]
[changelog entry for bug #189.
David Roundy <[EMAIL PROTECTED]>**20050731132624]
[add description of how to add changelog entries to ChangeLog.README.
David Roundy <[EMAIL PROTECTED]>**20050806225901]
[Explain the missing ChangeLog
Mark Stosberg <[EMAIL PROTECTED]>**20050526135421
It should be easy for casual users and contributors to view and update the
ChangeLog.
Providing a README file in the place where people are most likely to look
provides a very useful clue.
However, it's still not clear to me exactly how the system works, so I have
left a stub to complete that documentation.
Mark
]
[fix obsolete error explanation in get_extra bug.
David Roundy <[EMAIL PROTECTED]>**20050804130610]
[simplify fix for bug 463; reuse /// from FilePathUtils
Matt Lavin <[EMAIL PROTECTED]>**20050804021130]
[Make curl exit with error on failed downloads
[EMAIL PROTECTED]
[Bump up AC_PREREQ version to 2.59.
[EMAIL PROTECTED]
[fix for bug 463 (with new test)
Matt Lavin <[EMAIL PROTECTED]>**20050802002116]
[bump version number, since I just made a release.
David Roundy <[EMAIL PROTECTED]>**20050731190756]
[Use simpler curl_version() function to get version string.
Kannan Goundan <[EMAIL PROTECTED]>**20050322221027]
[fix documentation on --reorder-patches.
David Roundy <[EMAIL PROTECTED]>**20050731185406]
[add changelog entry for bug #224.
David Roundy <[EMAIL PROTECTED]>**20050731133942]
[fix bug when editing long comment leaves empty file.
David Roundy <[EMAIL PROTECTED]>**20050731133612]
[TAG 1.0.4pre2
David Roundy <[EMAIL PROTECTED]>**20050731121029]
Patch bundle hash:
5bad94d2452044634c7b9324a141e7237fff7b65
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
