[darcs-devel] darcs patch: Make annotate work on files with spaces in the name

[Edwin Thomson]

Fixes Issue 65 ( http://bugs.darcs.net/issue65 )

Edwin
-------------- next part --------------

New patches:

[Make annotate work on files with spaces in the name
edwin.thomson at businesswebsoftware.com**20060829160138
 
] {
hunk ./Population.lhs 37
-import FileName ( fn2fp, fp2fn, norm_path )
+import FileName ( fn2fp, fp2fn, fn2ps, norm_path )
hunk ./Population.lhs 243
-lookup_pop f p@(Pop _ (PopFile i))
+lookup_pop f p = lookup_pop' (unpackPS $ fn2ps $ fp2fn f) p
+
+lookup_pop' :: String -> Population -> Maybe Population
+lookup_pop' f p@(Pop _ (PopFile i))
hunk ./Population.lhs 249
-lookup_pop d p@(Pop pinfo (PopDir i c))
+lookup_pop' d p@(Pop pinfo (PopDir i c))
hunk ./Population.lhs 251
-        case catMaybes $ map (lookup_pop (dropDS d).(Pop pinfo)) c of
+        case catMaybes $ map (lookup_pop' (dropDS d).(Pop pinfo)) c of
hunk ./Population.lhs 258
-        d' -> case catMaybes $ map (lookup_pop d'.(Pop pinfo)) c of
+        d' -> case catMaybes $ map (lookup_pop' d'.(Pop pinfo)) c of
hunk ./Population.lhs 267
-lookup_creation_pop b a (Pop pinfo pp) = (Pop pinfo) `liftM` lcp pp
+lookup_creation_pop pinfo f p = lookup_creation_pop' pinfo (unpackPS $ fn2ps $ fp2fn f) p
+
+lookup_creation_pop' :: PatchInfo -> String -> Population -> Maybe Population
+lookup_creation_pop' b a (Pop pinfo pp) = (Pop pinfo) `liftM` lcp pp
}

Context:

[Test pull.pl, CREATE_DIR_ERROR: removed TODO now that directory name is printed in error message
Marnix Klooster <marnix.klooster at gmail.com>**20060304164033
 Also removes a superfluous (and erroneous) chdir statement, which tried to
 change to non-existing directory templ (last character was ell instead of one).
 
 Also improves the description of this test.
] 
[Refactor calls to ssh/scp/sftp.
Eric Kow <eric.kow at gmail.com>**20060706202509
 
] 
[Extend test suite for patch matching.
Eric Kow <eric.kow at gmail.com>**20060513192501
 
] 
[Implement help --match (issue91).
Eric Kow <eric.kow at gmail.com>**20060513185610
 
 Also, refactor matching code in a way that encourages developers
 to document for help --match any new matchers they create.
 
] 
[Replace dateparser.sh with more general match.pl for testing --match.
Eric Kow <eric.kow at gmail.com>**20060513104942
 
] 
[Add tests for pristine error and quiet mode when removing a directory.
Eric Kow <eric.kow at gmail.com>**20060513100021] 
[Replace test rmdir.sh with rmdir.pl.
Eric Kow <eric.kow at gmail.com>**20060513043823] 
[add some changelog entries
Tommy Pettersson <ptp at lysator.liu.se>**20060718152611] 
[Minor tweaks to list_authors.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060720180602] 
[Added elc and pyc to binaries.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060713184214] 
[Run ssh/scp/sftp quietly.
Eric Kow <eric.kow at gmail.com>**20060707025245
 
 This is useful for silencing Putty, and could also be for OpenSSH should
 we decide to stop redirecting to /dev/null.
 
] 
[Added up links in web interface.
Peter Stuifzand <peter at stuifzand.com>**20060610082238
 Added a link to the 'projects' part of the cgi repository interface, so that
 you go back to the project list.
] 
[Add a test suite for calling external programs.
Eric Kow <eric.kow at gmail.com>**20060521045407
 
 For now this only includes a test for ssh (issue171).
 
] 
[Suppress non-empty dir warning if Quiet.
Eric Kow <eric.kow at gmail.com>**20060513053456] 
[Add forgotten file umask.h.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060423174844] 
[Add --umask to all commands that write to the current repository.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060407195655] 
[Add option --umask.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060407194552] 
[Actually switch umasks in withRepoLock.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060407194202] 
[Implement withUMask.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060407193312] 
[Add umask.c.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060407193255] 
[Propagate opts to withRepoLock.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060325190622] 
[Merge makefile targets test_perl and test_shell into test_scripts.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060607223134
 This should keep parallel make from breaking.
] 
[add some changelog entries
Tommy Pettersson <ptp at lysator.liu.se>**20060616150558] 
[Add warning to Eric's SSHControlMaster rework.
Juliusz Chroboczek <jch at pps.jussieu.fr>**20060528194136] 
[Only launch SSH control master on demand (fixes issue171)
Eric Kow <eric.kow at gmail.com>**20060528093000
 
 A secondary benefit is that this encapsulates the use of the control
 master functionality and consequently simplifies calling ssh.  There is
 no need to deal with the details of launching or exiting the control
 master.
 
] 
[bump version to 1.0.8pre1
Tommy Pettersson <ptp at lysator.liu.se>**20060522122655] 
[Fail with a sensible message when there is no default repository to pull from.
lele at nautilus.homeip.net**20060515135042] 
[TAG 1.0.7
Tommy Pettersson <ptp at lysator.liu.se>**20060513171438] 
Patch bundle hash:
41ea035c03573b4c44191fade2ee1fdc2f84a493