I've put together some changes to the autoconf files that should allow
linking darcs against an external libgit. It won't automatically find
libgit for you, but it should get the compile settings right if you point
it to git.
I've also wrapped up Juliusz's patch of July 18th into a darcs patch
here.
Sat Jul 30 14:36:01 PDT 2005 Juliusz Chroboczek <[EMAIL PROTECTED]>
* Changes for Git 0.99
Fri Jul 29 11:34:40 PDT 2005 Wim Lewis <[EMAIL PROTECTED]>
* Simplify curses/ncurses search; use $LIBS
Fri Jul 29 11:56:32 PDT 2005 Wim Lewis <[EMAIL PROTECTED]>
* Use AS_HELP_STRING to format option descriptions
Sat Jul 30 22:02:59 PDT 2005 Wim Lewis <[EMAIL PROTECTED]>
* Do autoconf substitution on git.h
Sat Jul 30 22:03:41 PDT 2005 Wim Lewis <[EMAIL PROTECTED]>
* Autoconf support for linking against libgit.a
Allow (actually, require) the user to specify the location of the Git
implementation when including Git support. Attempt to discover whether
Git was compiled to require OpenSSL's implementation of SHA1.
New patches:
[Changes for Git 0.99
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050730213601]
<
> {
hunk ./git.c 27
#include <stdarg.h>
#include <time.h>
-#include "git/read-cache.c"
-#include "git/sha1_file.c"
-
#include "git.h"
hunk ./git.c 29
-void
-die(const char *err, ...)
-{
- va_list params;
-
- va_start(params, err);
- fputs("Git fatal errror: ", stderr);
- vfprintf(stderr, err, params);
- va_end(params);
- /* tough... */
- exit(1);
-}
-
struct git_file *
git_read_file(const unsigned char *string)
{
hunk ./git.c 374
{
int rc;
char sha1[20];
- char *buffer;
struct git_file_info *info;
hunk ./git.c 376
- buffer = malloc(length + 200);
- if(buffer == NULL) {
- fprintf(stderr, "Couldn't allocate Git write buffer.\n");
- return NULL;
- }
-
- /* in order to avoid the copy, we'll need to duplicate much of
- write_sha1_file */
-
- rc = sprintf(buffer, "%s %lu", type, length);
- rc++;
- memcpy(buffer + rc, contents, length);
- rc = write_sha1_file(buffer, rc + length, sha1);
+ rc = write_sha1_file(contents, length, type, sha1);
if(rc < 0) {
hunk ./git.c 379
- free(buffer);
fprintf(stderr, "Couldn't write Git file.\n");
return NULL;
}
hunk ./git.c 440
git_write_tree_done(struct git_write_iterator *iter, char *name, unsigned mode)
{
struct git_file_info *info;
- char *realbuf, *buffer, sha1[20];
+ char *buffer, sha1[20];
int i, j, k, l;
l = 0;
hunk ./git.c 448
l += strlen(iter->elts[i].name) + 20 + 20;
l += 200;
- realbuf = malloc(l);
- if(realbuf == NULL)
+ buffer = malloc(l);
+ if(buffer == NULL)
return NULL;
hunk ./git.c 452
- buffer = realbuf + 200;
-
j = 0;
for(i = 0; i < iter->count; i++) {
j += sprintf(buffer + j, "%o %s",
hunk ./git.c 462
j += 20;
}
- buffer[-1] = '\0';
- i = -1;
- k = j;
- do {
- buffer[--i] = k % 10 + '0';
- k /= 10;
- } while(k);
-
- i -= 5;
- memcpy(buffer + i, "tree ", 5);
-
- write_sha1_file(buffer + i, j - i, sha1);
- free(realbuf);
+ write_sha1_file(buffer, j, "tree", sha1);
+ free(buffer);
for(i = 0; i < iter->count; i++)
free(iter->elts[i].name);
}
[Simplify curses/ncurses search; use $LIBS
Wim Lewis <[EMAIL PROTECTED]>**20050729183440]
<
[Include autoconf-detected libs in LDFLAGS
Joshua J. Berry <[EMAIL PROTECTED]>**20050728031609
Autoconf uses @LIBS@ -- not @LDFLAGS@ -- for libraries it detects (e.g. using
AC_SEARCH_LIBS).
]
> {
hunk ./configure.ac 389
HAVE_CURSES=False
if test "$with_libcurses" != "no"; then
AC_CHECK_HEADER(term.h,
- [AC_CHECK_LIB(curses, tgetent,
- [HAVE_CURSES=True
- LDFLAGS="$LDFLAGS -lcurses"],
- [AC_CHECK_LIB(ncurses, tgetent,
- [HAVE_CURSES=True
- LDFLAGS="$LDFLAGS -lncurses"],
- [AC_MSG_WARN(Cannot find libcurses, disabling color.)])])],
- [AC_MSG_WARN([Cannot find term.h, disabling color.])]
- )
+ [AC_SEARCH_LIBS(tgetent, [curses ncurses], [HAVE_CURSES=True])])
+ if test "$HAVE_CURSES" != "True"; then
+ AC_MSG_WARN([Cannot find term.h, disabling color.])
+ fi
fi
AC_SUBST(HAVE_CURSES)
hunk ./configure.ac 403
AC_MSG_ERROR([Cannot find zlib.h; please set the CPPFLAGS environment variable!]))
AC_CHECK_FUNC(gzopen, [],
[
- AC_CHECK_LIB(z, gzopen, LDFLAGS="$LDFLAGS -lz",
+ AC_CHECK_LIB(z, gzopen, LIBS="$LIBS -lz",
[
AC_MSG_ERROR(Cannot find system's zlib library; please set the LDFLAGS environment variable!)
])
}
[Use AS_HELP_STRING to format option descriptions
Wim Lewis <[EMAIL PROTECTED]>**20050729185632]
<
> {
hunk ./configure.ac 166
AC_MSG_CHECKING([whether to optimize])
AC_ARG_ENABLE(optimize,
- [ --disable-optimize disable optimization],
- optimize=$enableval, optimize=yes)
+ AS_HELP_STRING([--disable-optimize],[disable optimization]),
+ optimize=$enableval, optimize=yes)
AC_MSG_RESULT($optimize)
if test "$optimize" = yes; then
hunk ./configure.ac 185
AC_MSG_CHECKING([whether to profile])
AC_ARG_ENABLE(profile,
- [ --enable-profile enable profiling],
+ AS_HELP_STRING([--enable-profile],[enable profiling]),
profile=$enableval,profile=no)
AC_MSG_RESULT($profile)
hunk ./configure.ac 196
dnl See if we want to use mmap... for the moment just default to no.
AC_MSG_CHECKING([whether to use mmap])
-AC_ARG_ENABLE(mmap,
- [ --disable-mmap do not use mmap (use this flag if you get bus errors)],,enable_mmap=yes)
+AC_ARG_ENABLE(mmap, AS_HELP_STRING([--disable-mmap],
+ [do not use mmap (use this flag if you get bus errors)]),
+ enable_mmap=$enableval,enable_mmap=yes)
AC_MSG_RESULT($enable_mmap)
USE_MMAP="True"
if test "$enable_mmap" = "no"; then
hunk ./configure.ac 232
AC_MSG_CHECKING([whether to use wxhaskell])
AC_ARG_WITH(wx,
- [ --with-wx use wxhaskell to provide a GUI interface],
+ AS_HELP_STRING([--with-wx],
+ [use wxhaskell to provide a GUI interface]),
,with_wx=no)
AC_MSG_RESULT($with_wx)
if test "$with_wx" = "yes"; then
hunk ./configure.ac 317
dnl Allow use of color in output to be disabled
-AC_ARG_ENABLE(color, [ --disable-color do not use ansi color escapes])
+AC_ARG_ENABLE(color, AS_HELP_STRING([--disable-color],[do not use ansi color escapes]))
dnl export color flag
USE_COLOR="True"
hunk ./configure.ac 344
dnl Find libcurl and other libraries needed by hscurl.c
-AC_ARG_WITH(libcurl, [ --without-libcurl do not use libcurl])
+AC_ARG_WITH(libcurl,
+ AS_HELP_STRING([--without-libcurl],[do not use libcurl]))
CURLLDFLAGS=
}
[Do autoconf substitution on git.h
Wim Lewis <[EMAIL PROTECTED]>**20050731050259]
<
> {
move ./git.h ./git.h.in
hunk ./configure.ac 454
dnl Write results
OUTPUT_WORKAROUND
-AC_OUTPUT([autoconf.mk Autoconf.lhs ThisVersion.lhs
+AC_OUTPUT([autoconf.mk git.h Autoconf.lhs ThisVersion.lhs
cgi/darcs.cgi cgi/README cgi/cgi.conf])
cat <<[EOF]
}
[Autoconf support for linking against libgit.a
Wim Lewis <[EMAIL PROTECTED]>**20050731050341
Allow (actually, require) the user to specify the location of the Git
implementation when including Git support. Attempt to discover whether
Git was compiled to require OpenSSL's implementation of SHA1.
]
<
[cosmetic changes
Peter Simons <[EMAIL PROTECTED]>**20050719135834]
[Include autoconf-detected libs in LDFLAGS
Joshua J. Berry <[EMAIL PROTECTED]>**20050728031609
Autoconf uses @LIBS@ -- not @LDFLAGS@ -- for libraries it detects (e.g. using
AC_SEARCH_LIBS).
]
[Do autoconf substitution on git.h
Wim Lewis <[EMAIL PROTECTED]>**20050731050259]
> {
hunk ./autoconf.mk.in 39
GIT_SRCS := @GIT_SRCS@
GIT_C_OBJS := @GIT_C_OBJS@
+GHCFLAGS_Git.o = $(GHCFLAGS) @GIT_GHC_FLAGS@
all : config @TARGETS@
hunk ./autoconf.mk.in 60
Context.hs: stringify
test -f \$@ || echo unknown | ./stringify Context context > \$@
endif
+
+# Weird and wonderful GNU Make "target-specific variable" syntax
+ifneq (,'@GIT_C_OBJS@')
+$(GIT_C_OBJS) : OPTCCFLAGS+= @GIT_GHC_FLAGS@
+endif
darcs-stable.tar.gz: dist
ln -sf "darcs-$(DARCS_VERSION).tar.gz" $@
hunk ./configure.ac 397
AC_MSG_WARN([Cannot find term.h, disabling color.])
fi
fi
-
AC_SUBST(HAVE_CURSES)
dnl look for zlib library and header.
hunk ./configure.ac 411
])
])
-dnl Check for libssl
-
-HAVE_LIBSSL=False
-AC_CHECK_HEADER(openssl/sha.h,
- [AC_SEARCH_LIBS(SHA1_Init, crypto ssl, [HAVE_LIBSSL=True])])
dnl Check whether Git support was requested
hunk ./configure.ac 421
AC_MSG_RESULT($git)
if test "$git" = yes; then
+ AC_ARG_WITH(git-core, AS_HELP_STRING([--with-git-core=path],
+ [path to Git-core source directory]),[
+ GIT_LDFLAGS="-L$withval"
+ GIT_CPPFLAGS="-I$withval"
+ if test -d "$withval" -a -r "$withval/cache.h" ; then true; else
+ AC_MSG_WARN([`$withval' does not look like git-core directory!])
+ fi])
+ AC_ARG_WITH(git-includes, AS_HELP_STRING([--with-git-includes=-Ipath],
+ [extra CPP options needed to use Git headers]),
+ [GIT_CPPFLAGS="$withval $GIT_CPPFLAGS"])
+
+ for shatype in none fake openssl ; do
+ case $shatype in
+ none)
+ SHA_HEADER_DEFINE=
+ try=true
+ ;;
+ fake)
+ SHA_HEADER_DEFINE='#define SHA1_HEADER <stdio.h>'
+ try=true
+ ;;
+ openssl)
+ try=false
+ AC_CHECK_HEADER(openssl/sha.h,
+ [SHA_HEADER_DEFINE='#define SHA1_HEADER <openssl/sha.h>'
+ AC_SEARCH_LIBS(SHA1_Init, crypto ssl, [try=true])])
+ ;;
+ esac
+ LIBS_save="$LIBS"
+ CPPFLAGS_save="$CPPFLAGS"
+ LDFLAGS_save="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $GIT_CPPFLAGS"
+ LIBS="-lgit $LIBS"
+ LDFLAGS="$GIT_LDFLAGS $LDFLAGS"
+ if $try ; then
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+$SHA_HEADER_DEFINE
+#include "cache.h"]],
+ [[int j = read_cache();
+ j = j + write_sha1_file(NULL, 0, NULL, NULL);
+ ]])],,[try=false])
+ fi
+ CPPFLAGS="$CPPFLAGS_save"
+ if $try ; then
+ AC_MSG_NOTICE([Using Git SHA1 type: $shatype])
+ break
+ else
+ LDFLAGS="$LDFLAGS_save"
+ LIBS="$LIBS_save"
+ fi
+ done
+
+ if $try ; then
+ git=yes
+ else
+ git=no
+ AC_MSG_FAILURE([Unable to link against git library.])
+ fi
+fi
+
+GIT_GHC_FLAGS=
+if test "$git" = yes; then
GIT_SRCS="GitRepo.lhs Git.lhs"
GIT_C_OBJS="git.o"
GHCFLAGS="$GHCFLAGS -DENABLE_GIT"
hunk ./configure.ac 486
+ for gitflag in $GIT_CPPFLAGS ; do
+ case "$gitflag" in
+ -D*) GIT_GHC_FLAGS="$GIT_GHC_FLAGS '$gitflag'" ;;
+ *) GIT_GHC_FLAGS="$GIT_GHC_FLAGS '-optc$gitflag'" ;;
+ esac
+ done
else
GIT_SRCS="GitRepo.lhs"
GIT_C_OBJS=
hunk ./configure.ac 495
+ GIT_GHC_FLAGS=
fi
AC_SUBST(GIT_SRCS)
hunk ./configure.ac 500
AC_SUBST(GIT_C_OBJS)
+AC_SUBST(GIT_GHC_FLAGS)
+AC_SUBST(SHA_HEADER_DEFINE)
dnl Look for a suitable diff command
hunk ./configure.ac 534
libexecdir = $libexecdir
Build Manual = $BUILDDOC
+ Git support = $git
If you want to adjust any of these values, edit autoconf.mk and
Autoconf.lhs -- or run configure with appropriate settings.
hunk ./git.h.in 19
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "git/cache.h"
[EMAIL PROTECTED]@
hunk ./git.h.in 21
-void die(const char *err, ...);
+#include "cache.h"
struct git_file {
unsigned char *data;
}
Context:
[remove TODO annotation for two tests that now pass.
David Roundy <[EMAIL PROTECTED]>**20050728115034]
[fix bug introduced in 208 fix which messed up --list-options output.
David Roundy <[EMAIL PROTECTED]>**20050729121804
We need to make sure that drop_paths doesn't do anything to an absolute
path or URL.
]
[Merge changes
Ian Lynagh <[EMAIL PROTECTED]>**20050728230858]
[Don't die on sigALRM (linking with -threaded means we see loads of them)
Ian Lynagh <[EMAIL PROTECTED]>**20050728131023]
[Give help for 'c' in selectchanges
Ian Lynagh <[EMAIL PROTECTED]>**20050728125910]
[Update QueryManifest with the Repository changes
Ian Lynagh <[EMAIL PROTECTED]>**20050728185646]
[Merge changes
Florian Weimer <[EMAIL PROTECTED]>**20050607203225]
[Test case for "query manifest"
Florian Weimer <[EMAIL PROTECTED]>**20050510113803]
[Remove the "query changes" and "query annotate" subcommands
Florian Weimer <[EMAIL PROTECTED]>**20050510060221]
[Remove --disable on supercommands
Florian Weimer <[EMAIL PROTECTED]>**20050510054744]
[Resolve conflict
Florian Weimer <[EMAIL PROTECTED]>**20050510054405]
[Add --help in command_options, like --disable
Florian Weimer <[EMAIL PROTECTED]>**20050510053348
--list-options is still separate, to keep it undocumented.
]
[Resolve conflict
Florian Weimer <[EMAIL PROTECTED]>**20050510052119]
[Move --disable to the end of the option list
Florian Weimer <[EMAIL PROTECTED]>**20050510051905]
[Include the query subcommand documentation in Query.lhs
Florian Weimer <[EMAIL PROTECTED]>**20050510051533]
[Print usage information if the subcommand is missing
Florian Weimer <[EMAIL PROTECTED]>**20050509101427
Add a separating line to the invalid subcommand error message.
]
[Fix empty lines in "darcs query --help" output
Florian Weimer <[EMAIL PROTECTED]>**20050509100509]
[Resolve conflicts
Florian Weimer <[EMAIL PROTECTED]>**20050509094729]
[Add the --disable option in command_options, not in run_the_command
Florian Weimer <[EMAIL PROTECTED]>**20050509093929
This change makes it possible to specialize the list of default commands
(such as --disable) on different DarcsCommand constructors.
]
[Add --pending option to "query manifest"
Florian Weimer <[EMAIL PROTECTED]>**20050508080502]
[Add the --files and --directories options to "query manifest"
Florian Weimer <[EMAIL PROTECTED]>**20050507223327]
[Implement list_slurpy_dirs
Florian Weimer <[EMAIL PROTECTED]>**20050507223257]
[Add --null flag to the "query manifest" command
Florian Weimer <[EMAIL PROTECTED]>**20050507213547]
[Add "query manifest" command
Florian Weimer <[EMAIL PROTECTED]>**20050507163125]
[Implement the \haskell command for subcommands
Florian Weimer <[EMAIL PROTECTED]>**20050507160607]
[Mention the structure of subcommands in the documentation
Florian Weimer <[EMAIL PROTECTED]>**20050507151003]
[Handle subcommands in the preprocessor
Florian Weimer <[EMAIL PROTECTED]>**20050507150829
You can use "\options{SUPER SUB}" to document the options of a
subcommand.
]
[Do not include the "query" command in the manual
Florian Weimer <[EMAIL PROTECTED]>**20050507150707
The commands will be documented individually, in the relevant section.
]
[Mention "query" subcommands in the man page
Florian Weimer <[EMAIL PROTECTED]>**20050507135756
"changes" is now documented as "query changes". "query annotate" is
mentioned, too.
]
[add subcommand infrastructure and (currently useless) query command.
David Roundy <[EMAIL PROTECTED]>**20050507115457
The idea of course is that this can be readily extended to add nice new
simple subcommands under query.
]
[resolve conflict with myself...
David Roundy <[EMAIL PROTECTED]>**20050727100745]
[fix pulling from a relative defaultrepo from within a subdirectory.
David Roundy <[EMAIL PROTECTED]>**20050722105708
This is a fix for bug #208. It is perhaps a tad more invasive than
necesary, and introduces a FilePathUtils module that is perhaps
overkill... especially since it doesn't do much.
]
[Small tweaks to the with_new_pending patch
Ian Lynagh <[EMAIL PROTECTED]>**20050727025308]
[replace write_pending with "with_new_pending".
David Roundy <[EMAIL PROTECTED]>**20050722125725
This patch is basically an extension of Ian's earlier patch that created a
"write_pending_then" function. This one creates two functions,
with_new_pending and add_to_pending.
The idea is that we can't check if a new pending is valid until after we've
updated the pristine cache. But it's possible that the pending patch
itself was lazily generated with get_unrecorded, in which case it's not
safe to modify the pristine cache until after we've written pending. This
new interface makes it much harder to make this kind of mistake. I also
think it's pretty intuitive.
]
[Include autoconf-detected libs in LDFLAGS
Joshua J. Berry <[EMAIL PROTECTED]>**20050728031609
Autoconf uses @LIBS@ -- not @LDFLAGS@ -- for libraries it detects (e.g. using
AC_SEARCH_LIBS).
]
[Removed an unused reference to Slurpy
Ian Lynagh <[EMAIL PROTECTED]>**20050709114603]
[new changelog entries.
David Roundy <[EMAIL PROTECTED]>**20050726123329]
[clean up formatting in Depends.
David Roundy <[EMAIL PROTECTED]>**20050723130807]
[changelog entry for fix to RT#208.
David Roundy <[EMAIL PROTECTED]>**20050722113803]
[make make_changelog a bit more flexible in its parsing.
David Roundy <[EMAIL PROTECTED]>**20050722113701
One can now have blank lines between the match: lines and the actual
comments.
]
[give better error message when dealing with a non-repository.
David Roundy <[EMAIL PROTECTED]>**20050722105908]
[make make_changelog ignore boring files (emacs backups) in changelog.in/entries/.
David Roundy <[EMAIL PROTECTED]>**20050726121455]
[add changelog entry for get --partial fix.
David Roundy <[EMAIL PROTECTED]>**20050723130715]
[scrunch up the tla/cvs tables a bit in the manual.
David Roundy <[EMAIL PROTECTED]>**20050724181011]
[another alternative formatting for cvs/tla tables.
Erik Schnetter <[EMAIL PROTECTED]>**20050724134656]
[fix bug in get_patches_beyond_tag that broke get --partial.
David Roundy <[EMAIL PROTECTED]>**20050723125507
The bug was that we sometimes looked at patches that weren't strictly
necesary. This was because of the concat in get_patches_beyond_tag, which
loses information about tag dependencies. A clean implementation of a
get_extra that accepts a true PatchSet would be a nicer fix (since it might
fix other similar problems), but this fix is also correct and simple.
]
[alternative formatting for cvs/tla tables.
Erik Schnetter <[EMAIL PROTECTED]>**20050724113905]
[make add/remove --list-options not output preceding ./
David Roundy <[EMAIL PROTECTED]>**20050723134758
We were treating the repository root differently from subdirectories
because the file paths didn't need to get "fixed". Addresses bug #158.
]
[fix unit test that prompts for input
Will <[EMAIL PROTECTED]>**20050722181028]
[put configure.ac back in the public domain.
David Roundy <[EMAIL PROTECTED]>**20050720115702]
[Make DarcsRepo.add_to_inventory take a list.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050720174029
This avoids opening the inventory multiple times. Thanks to Ian for the hint.
]
[Use mapM_ instead of the comprehensible alternative.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050720164258
Mentioning mapM_ always impresses people at dinner parties. Thanks to
Ian for the hint.
]
[Move iterateGitTree out of the IO monad.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050720162841
We're reading immutable on-disk data, it's safe to do it unsafely.
]
[Clean up usage of interleaveIO in Git.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050720162251]
[fix error in name of --reorder-patches flag.
David Roundy <[EMAIL PROTECTED]>**20050722110752]
[advance DARCS_VERSION to 1.0.4pre2.
David Roundy <[EMAIL PROTECTED]>**20050720115536
In the new tradition of changing the version after a release rather than
before a release (although when the release type changes to rc or actual
release it'll have to be done before the release).
]
[drop $srcdir use; build-directories aren't supported anyway
Peter Simons <[EMAIL PROTECTED]>**20050719140044]
[clean generated manual files at realclean
Peter Simons <[EMAIL PROTECTED]>**20050719135935]
[cosmetic changes
Peter Simons <[EMAIL PROTECTED]>**20050719135834]
[move comment to the right place
Peter Simons <[EMAIL PROTECTED]>**20050719135818]
[let config.status generate config.command
Peter Simons <[EMAIL PROTECTED]>**20050719135733]
[make use of autoconf 2.5x's AC_INIT macro
Peter Simons <[EMAIL PROTECTED]>**20050719135611]
[use ./config.status to re-configure build after autoconf changes
Peter Simons <[EMAIL PROTECTED]>**20050719135435]
[update distclean and realclean targets
Peter Simons <[EMAIL PROTECTED]>**20050719135415]
[canonize [EMAIL PROTECTED]
Peter Simons <[EMAIL PROTECTED]>**20050719134834]
[cosmetic change
Peter Simons <[EMAIL PROTECTED]>**20050719134816]
[update test suite to work with Peter's makefile changes.
David Roundy <[EMAIL PROTECTED]>**20050721102319]
[fix write_problem to show all problems.
David Roundy <[EMAIL PROTECTED]>**20050717110628]
[don't import head and tail, which are in the prelude.
David Roundy <[EMAIL PROTECTED]>**20050716143547]
[Push and pull can now show the detailed diffs of patches
Jim Radford <[EMAIL PROTECTED]>**20050717042645
The same distinction is now made between --summary and --verbose
as changes makes.
]
[Rename bound variable in fromJust macro.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050716221705
Avoids ``shadows existing variable'' warnings which for some reason are
errors.
Could we please use Lisp macros instead?
]
[TAG 2005-07-18
Ian Lynagh <[EMAIL PROTECTED]>**20050718193534]
[TAG 1.0.4pre1
David Roundy <[EMAIL PROTECTED]>**20050718112234]
[TAG 2005-007-16
Ian Lynagh <[EMAIL PROTECTED]>**20050716181541]
[make configure automatically guess the release state based on defaultrepo and tags.
David Roundy <[EMAIL PROTECTED]>**20050718112222]
[bugfix, make _darcs/prefs/defaults really override $HOME/.darcs/defaults
Tommy Pettersson <[EMAIL PROTECTED]>**20050612174925
Variants of the same flag from the two defaults files where just merged,
and an ALL in the local defaults could not override an explicit command
in the global defaults, as would be expected.
]
[Keep file modes in dirty Git slurpies.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050716071846
This prevents Darcs from resetting Git file permissions.
]
[Update HEAD in place.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050716071116]
[Generalise write_pending.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050716002145
I missed this, which breaks add and remove.
]
[Use emptyGitSlurpy in gitCommitToPatch'.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715234115]
[Fix parsing of Git merges with no common ancestor.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715233226]
[Implement emptyGitSlurpy.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715233211]
[Fix typo in applyF_direct (Git).
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715233140]
[Don't include ./ when generating patches from Git.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715203248]
[Generalise rollback.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715194322]
[Make histories that come from Git lazy in the presence of merges.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715193440
Use the fact that we know the length of the result of a merge to produce a
spine-lazy list of patches. This makes ``darcs changes'' never touch
a blob.
]
[Make darcs understand Git n-ary merges.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050715192333]
[move read/write format checks into identifyRepository and withRepoLock.
David Roundy <[EMAIL PROTECTED]>**20050714105840]
[cleanups in RepoFormat as suggested by Ian.
David Roundy <[EMAIL PROTECTED]>**20050711125711]
[Generalise Pull and Apply.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050712145643]
[Generate Git PatchInfos from scratch.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050712123945
patchtopatchinfo is not lazy enough.
]
[Replace frobPatchFile with patchTokenToPatchFile.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050711045246]
[Make writing of patches work in arbitrary directories.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050711021014]
[Use impossible.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050711015640]
[Make patch tokens opaque.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050711014829]
[fix typo in git prefsUrl.
David Roundy <[EMAIL PROTECTED]>**20050711100531]
[generalize Revert and Unrevert.
David Roundy <[EMAIL PROTECTED]>**20050711100429]
[fix bug where we failed to convert sha1 to hex.
David Roundy <[EMAIL PROTECTED]>**20050711092602]
[Make record repository-format agnostic.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710034630]
[Implement polymorphic write support.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710034310]
[Make withRepoLock polymorphic.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710023802]
[Make writePatch and updateInventory polymorphic.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710021543]
[Make sync_repo polymorphic.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710021426]
[Import GitRepo from darcs-git.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710015221
This version has write support and support for reverse-engineering
Darcs merges from Git merges.
]
[Add ``lax'' argument to applyToGitSlurpy.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710014814
When lax is true, we apply merger_equivalent to mergers.
]
[Make read/write_pending polymorphic.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710012515]
[don't go through shell when execing darcs
Wim Lewis <[EMAIL PROTECTED]>**20050710062743
Use the LIST variant of exec to avoid exposing the arguments of the darcs
command to shell interpretation. Also, pipe the output directly to where
it's going instead of reading it in and writing it out again.
]
[fix incorrectly quoted regexp
Wim Lewis <[EMAIL PROTECTED]>**20050710051424
Unquoted regexp evaluated to 0 or 1, which didn't immediately break the cgi
because most hashes have those characters in them. Also fixed a bogus
initializer caught by "perl -w".
]
[update comments in darcs.cgi
Wim Lewis <[EMAIL PROTECTED]>**20050710050226]
[Use a pipe instead of a temp file
Wim Lewis <[EMAIL PROTECTED]>**20050710005052
Instead of storing the intermediate XML in a temporary file and then invoking
xsltproc, just pipe the XML directly into the xslt processor on the fly.
]
[Fix make_changelog to work with David's new identifyRepository.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710002419]
[Fix typo in import of malloc.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050710001235]
[Add comment about immutability of Git trees.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050709215815]
[Fix location of HEAD in Git.updateHead.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050709215408]
[implement missing DarcsIO methods in SlurpMonad.
David Roundy <[EMAIL PROTECTED]>**20050709192216]
[clean up GitTreeIterator.
David Roundy <[EMAIL PROTECTED]>**20050709174440]
[eliminate excess touching in Git.
David Roundy <[EMAIL PROTECTED]>**20050709170954]
[make GitFileInfo a cleaner more haskellish data type.
David Roundy <[EMAIL PROTECTED]>**20050709170457]
[add some typesafety to haskell cache_entry-related Git code.
David Roundy <[EMAIL PROTECTED]>**20050709153935]
[add a bit of type safety to the pointers to git_tree_iterator.
David Roundy <[EMAIL PROTECTED]>**20050709153337]
[make GitFile use the ffi more nicely.
David Roundy <[EMAIL PROTECTED]>**20050709152131]
[replace fromSingleton with gitSingleCommitValue which gives better error message.
David Roundy <[EMAIL PROTECTED]>**20050709145616]
[implement CString utility functions in FastPackedString.
David Roundy <[EMAIL PROTECTED]>**20050709145549]
[use withSlurpy to implement apply_to_slurpy.
David Roundy <[EMAIL PROTECTED]>**20050709145517]
[make darcs send look in the right place for target email address.
David Roundy <[EMAIL PROTECTED]>**20050709121505]
[fix bug in Repository abstraction code that broke remote pulls.
David Roundy <[EMAIL PROTECTED]>**20050709120518
This change adds to the Repository data object the URL of the repository in
question, allowing us to use this abstraction with both remote and local
repositories.
]
[add support for repository format checking.
David Roundy <[EMAIL PROTECTED]>**20050709112017
The idea being to be forward-compatible with repository format changes.
]
[use darcs_xml() where it simplifies things
Wim Lewis <[EMAIL PROTECTED]>**20050709023659]
[add an unused RepoFormat module.
David Roundy <[EMAIL PROTECTED]>**20050430123937]
[use AC_SEARCH_LIBS instead of AC_CHECK_LIB
Wim Lewis <[EMAIL PROTECTED]>**20050707181811]
[Update AC_PREREQ to 2.54
Wim Lewis <[EMAIL PROTECTED]>**20050707181631
The form of AC_C_BIGENDIAN used here didn't show up until 2.53 or 2.54.
Also, no need to specify the third arg, since it defaults to erroring out anyway.
]
[Merge conflicts in configure.ac, and add blank line to try to avoid future conflicts
Ian Lynagh <[EMAIL PROTECTED]>**20050707160658]
[Revert an accidental Repository -> DarcsRepo change in a string
Ian Lynagh <[EMAIL PROTECTED]>**20050707160431]
[Revert "Cache pristine directory within NoPristine"
Ian Lynagh <[EMAIL PROTECTED]>**20050707153500]
[make git support configurable (copied from Juliusz's patch).
David Roundy <[EMAIL PROTECTED]>**20050701135046]
[TAG another version that works in the git-merge saga.
David Roundy <[EMAIL PROTECTED]>**20050701133252]
[fix errors from merging more darcs-git stuff.
David Roundy <[EMAIL PROTECTED]>**20050701133228]
[resolve some more conflicts.
David Roundy <[EMAIL PROTECTED]>**20050701132446]
[TAG working version in middle of darcs-git merge.
David Roundy <[EMAIL PROTECTED]>**20050701125730]
[resolve conflicts between git and darcs-unstable.
David Roundy <[EMAIL PROTECTED]>**20050701125706]
[Cache pristine directory within NoPristine.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426172006]
[eliminate unnecesary unsafePerformIOs in Git.
David Roundy <[EMAIL PROTECTED]>**20050701142312]
[Move gitIsTree to C code.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050509235651]
[Simplify gitBlobToPatches.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050509234445]
[Remove obsolete comment.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050507195543]
[Make ordering of trees Linus-compatible.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050507184412]
[Don't sort when purifying Git slurpies.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050507024134
The new ordering is preserved by purification.
]
[Replace the definition of Ord on GitSlurpy with one that works.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050507023832
This is still not Linus-compliant, as Haskell and C use different ordering
conventions.
]
[Fix typo in noname.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050506222328]
[Make gitFooToPatches work with dirty trees.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050506200939]
[Export GitSlurpy.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050506181048]
[Implement a variant of gitCommitToPatch that takes a GitSlurpy reference.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050506180031]
[Get rid of gitCommitToPIMP.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050505181603]
[Move reading git commits out of the IO monad.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050505180609]
[Simplify generation of PatchSets from Git repos.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050505170207]
[Fix parsing of multiple parents in Git commits.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050505153025
Multiple parents come in separate parent lines, not a single line as I
thought.
]
[Fix Git date handling.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504233745]
[Fix formatting of Git files.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504211643]
[Fix formatting of Git records.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504210607]
[Only free those names that were allocated in git_write_tree_done.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504204933]
[Free the right buffer in git_write_tree_done.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504204910]
[Estimate the size of a new tree correctly.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504204850]
[Actually create new .git/HEAD (blush).
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504204825]
[Use "." as root of GitSlurpies.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504203304]
[Implement updateHead.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504193546]
[Implement git_update_head.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504193529]
[Implement writeGitCommit.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504192232]
[Add type argument to writeGitFile.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504185421]
[Make slurpGitCommit return a GitSlurpy after all.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504143935]
[Implement make_git_file_info.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504142613]
[Implement purification of Git trees.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504142042]
[Actually implement purification of blobs.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504125709]
[Add repo argument to purify.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050503234432]
[Partial implementation of purifyGitSlurpy.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050503232848]
[Generalise trackdown.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426233012]
[Make whatsnew go through Repository.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426162106
This won't work for Git repositories until they implement slurp_recorded
and get_recorded.
]
[Implement git_format_time.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504192053]
[Export Slurpy constructors.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426195817]
[Export applyBinary and applyHunkLines.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050503224204]
[Really don't include directories in slurpies.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050429235609]
[Make dist work with git repositories.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426203906]
[Fix merge conflicts.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425194100]
[Remove unsafeConstructPS.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050509233129]
[Declare Git's global variables as extern.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050507224710
Silly GHCi doesn't grok common symbols.
]
[Use RepoPrefs.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050506220257]
[Implement repoPrefs.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050506220152]
[Export PatchInfo constructor.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050504190531]
[Implement applyToGitSlurpy.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050503231941]
[Basic implementation of dirty Git slurpies.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050503222642]
[Use the cache when slurping the pristine state.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050430000813]
[Restructure patch generation from Git repos.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050427213320]
[Don't store directories in slurpies.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050427000833]
[Instance Show Slurpy.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426235914]
[Start slurping at ".".
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426203853]
[Implement slurping from git repositories.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426195957]
[Make pattern exhaustive.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426195941]
[Check for presence of .git/HEAD.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426195914]
[Move slurp_pending and slurp_recorded into Repository.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426185425]
[Move get_unrecorded to Repository.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426175527]
[Implement send for git repositories.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425210728]
[Implement changes for git repositories.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425205329]
[Use ForeignPtrs instead of raw pointers when useful.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425180449
Now I remember why I hate Haskell.
]
[Some less IO monad hacking.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425180207]
[Fix handling of subtrees.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425162405]
[Implement subtrees.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425063228]
[Parse new-style git dates.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425001902]
[Initial implementation of pulling from git.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050424213832]
[Add licence statements to Linus' files.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050426161330]
[Implement constructPS.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050425180306
I use touchForeignPtr in the finaliser when building a PS from a
ForeignPtr.
]
[Import parts of Linus' git 0.6.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050424213310]
[Implement unsafeConstructPS.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050424212204]
[Export diff_files from Diff.lhs.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050424212113]
[Export emptyFileContents from SlurpDirectory.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050424212051]
[First cut at remodularising repo access.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050424145002]
[Change Repository to DarcsRepo.
Juliusz Chroboczek <[EMAIL PROTECTED]>**20050424140132]
[TAG 2005-07-07
Ian Lynagh <[EMAIL PROTECTED]>**20050707144607]
[TAG darcs unstable 2005-05-29
Ian Lynagh <[EMAIL PROTECTED]>**20050529125403]
[Give an author when recording in tests/pull_binary.sh
Ian Lynagh <[EMAIL PROTECTED]>**20050701181818]
[atomically overwrite files in DarcsIO when creating a file.
David Roundy <[EMAIL PROTECTED]>**20050618173853]
[fix overly specific error message test in pull.pl.
David Roundy <[EMAIL PROTECTED]>**20050701150742]
[add test for pulling a binary patch with conflicting working directory removal.
David Roundy <[EMAIL PROTECTED]>**20050628121211]
[Need CInt type even when we don't HAVE_CURL
Ian Lynagh <[EMAIL PROTECTED]>**20050701174843]
[license aclocal.m4 with a more liberal license.
David Roundy <[EMAIL PROTECTED]>**20050622123111
For the curious, I've gotten Benedikt and Will's permission for this
change, who I believe are the only two other copyright holders on this
file.
]
[Fix types in SlurpDirectory
Ian Lynagh <[EMAIL PROTECTED]>**20050622022044]
[Fix types in SignalHandler
Ian Lynagh <[EMAIL PROTECTED]>**20050622021728]
[Fix types in SelectChanges
Ian Lynagh <[EMAIL PROTECTED]>**20050622021545]
[Fix type in Lock.lhs
Ian Lynagh <[EMAIL PROTECTED]>**20050621205228]
[Fix types of curses functions
Ian Lynagh <[EMAIL PROTECTED]>**20050621174621]
[Fix some types in Exec.lhs
Ian Lynagh <[EMAIL PROTECTED]>**20050621174238]
[Fix up types in get_curl
Ian Lynagh <[EMAIL PROTECTED]>**20050621173131]
[Remove redundant sift_for_pending
Ian Lynagh <[EMAIL PROTECTED]>**20050621173121]
[Fix typo
Florian Weimer <[EMAIL PROTECTED]>**20050510113824]
[Do not mention file name in error message for disabled commands
Florian Weimer <[EMAIL PROTECTED]>**20050510054931
We have multiple configuration files, and we do not know tat this point which
file contains the "disable" option.
]
[fixed a few typos in docs & comments
Wim Lewis <[EMAIL PROTECTED]>**20050624070640]
[Fall back to the inefficient, but safe, separate_middle_last_from_first defn.
Ian Lynagh <[EMAIL PROTECTED]>**20050615010549]
[Tidy up after tests
Ian Lynagh <[EMAIL PROTECTED]>**20050604193114]
[Fix test warnings
Ian Lynagh <[EMAIL PROTECTED]>**20050604193054]
[RT#413: add TODO test for bug: add should return an error when files can't be read.
Mark Stosberg <[EMAIL PROTECTED]>**20050602161701]
[RT#414: test case for 'record' failing when there are multiple files with permissions problems.
Mark Stosberg <[EMAIL PROTECTED]>**20050602163139]
[Teach apply how to handle ChangePref patches
Ian Lynagh <[EMAIL PROTECTED]>**20050615023428]
[Make more RepoPrefs functions generic in their Monad
Ian Lynagh <[EMAIL PROTECTED]>**20050615023359]
[Make some repo prefs functions generic in the Monad they use
Ian Lynagh <[EMAIL PROTECTED]>**20050615022455]
[Add m{Write,Read}BinFile, mDoes{Directory,File}Exist to DarcsIO
Ian Lynagh <[EMAIL PROTECTED]>**20050615022310]
[Don't define our lex function separately for PackedStrings, and take it out of Stringalike itself
Ian Lynagh <[EMAIL PROTECTED]>**20050615024343]
[Remove '\n's from Docs, and remove some unwanted spaces
Ian Lynagh <[EMAIL PROTECTED]>**20050615003925]
[format error to be easier to read
Mark Stosberg <[EMAIL PROTECTED]>**20050604231330
Before this change, the description ran directly into the patch name, like
this:
Couldn't read patch Wed Jul ...
]
[provide a clue with there is an error applying patch to recorded.
Mark Stosberg <[EMAIL PROTECTED]>**20050604230334]
[quit recommend 'get --verbose'
Mark Stosberg <[EMAIL PROTECTED]>**20050605004133
Get now gives nice feedback by default, a continually updating with feedback
like:
Copying patch 13 of 135
--verbose additionally shows the patch IDS, which most people won't care about.
So the --verbose recommedation is no longer needed.
]
[Only read darcs/cgi.conf once.
Wim Lewis <[EMAIL PROTECTED]>**20050623081319
Modified read_conf() so it caches the parsed configuration values
in a hash, instead of re-opening and re-reading the configuration
file several times per CGI invocation. (A probably-unimportant side
effect of this is that flag names can no longer contain spaces, but
that shouldn't affect anybody.)
]
[Documentation nits & typos
Wim Lewis <[EMAIL PROTECTED]>**20050618193852]
[update web page to reflect new stable release (1.0.3)
Tomasz Zielonka <[EMAIL PROTECTED]>**20050524225643]
[TAG 1.0.3
Tomasz Zielonka <[EMAIL PROTECTED]>**20050524215127]
[bump version to 1.0.3
Tomasz Zielonka <[EMAIL PROTECTED]>**20050524215115]
[GNUmakefile: update predist to copy Context.hs instead of c_context.c
Tomasz Zielonka <[EMAIL PROTECTED]>**20050525093936]
[move some of predist commands to GNUmakefile, to the predist target
Tomasz Zielonka <[EMAIL PROTECTED]>**20050525090659]
[add sal_last
Tommy Pettersson <[EMAIL PROTECTED]>**20050518194617]
[minor typo fix
[EMAIL PROTECTED]
[simple (inefficient) fix to bug in separate_last_from_first_middle.
David Roundy <[EMAIL PROTECTED]>**20050522133247]
[extend revert_interactive test to do a trickier revert.
David Roundy <[EMAIL PROTECTED]>**20050522134059]
[add test for interactive selection of revert.
David Roundy <[EMAIL PROTECTED]>**20050522130150
This test is currently failed by darcs-unstable, but passed by darcs-stable
and older. Something is wrong with with_selected_last_changes_to_files in
darcs-unstable. :(
]
[favicon support for rss feeds
Manuel M T Chakravarty <[EMAIL PROTECTED]>**20050520055950
- RSS feed readers, such as liferea, search for feed icons (named 'favicon.ico') in the
directory in which the feed is located
- By default, we source the icon data from /cgi-bin/favicon.ico, but the location
can be configured (in the same way as the location of the style sheet file)
- NB: This is the only way to associated a favicon with a feed on departmental
web servers etc, where the domain root is not under the feed providers
control. (Yet another alternative would be an associated html feed that embeds
a <link> tag.)
]
[fix small typo
Tomasz Zielonka <[EMAIL PROTECTED]>**20050521231058]
[fix bug when recording with a removed file as an argument (RT #396).
David Roundy <[EMAIL PROTECTED]>**20050520112358]
[add changelog entry for fix of bug #396.
David Roundy <[EMAIL PROTECTED]>**20050519111750]
[restructure best_practices, remove Basics and raise subsections one level
Tommy Pettersson <[EMAIL PROTECTED]>**20050511162756]
[Remove dead code
Ian Lynagh <[EMAIL PROTECTED]>**20050515174816]
[Make --test not keep the patch in memory when recording
Ian Lynagh <[EMAIL PROTECTED]>**20050515005751]
[Remove dead code
Ian Lynagh <[EMAIL PROTECTED]>**20050514161023]
[remove dirty flag and IO method from Slurpy.
David Roundy <[EMAIL PROTECTED]>**20050515103942
These are no longer needed, since we have removed slurp_write and friends.
]
[Merge changes
Ian Lynagh <[EMAIL PROTECTED]>**20050515164404]
[TAG 1.0.3rc2
Tomasz Zielonka <[EMAIL PROTECTED]>**20050515085617]
[bump version number to 1.0.3rc2
Tomasz Zielonka <[EMAIL PROTECTED]>**20050515085537]
[change predist pref to simply copy some files from the source repository
Tomasz Zielonka <[EMAIL PROTECTED]>**20050515085500]
[GNUmakefile: remove ChangeLog in realclean
Tomasz Zielonka <[EMAIL PROTECTED]>**20050514172725]
[explain in replace help that replace is a special patch [RT#317]
Tommy Pettersson <[EMAIL PROTECTED]>**20050512113444]
[Remove dead code related to and including slurp_write
Ian Lynagh <[EMAIL PROTECTED]>**20050513191928]
[Remove slurpy writing from Resolution
Ian Lynagh <[EMAIL PROTECTED]>**20050513191455]
[Remove slurpy writing from Diff
Ian Lynagh <[EMAIL PROTECTED]>**20050513184702]
[Implement clonePaths
Ian Lynagh <[EMAIL PROTECTED]>**20050513183651]
[When reverting, make sure the patch is forced before we try to use skipped
Ian Lynagh <[EMAIL PROTECTED]>**20050514135444]
[add test for interactive revert [RT#387]
Tommy Pettersson <[EMAIL PROTECTED]>**20050513075618]
[remove unneeded workaround tip for nvi from manual
Tommy Pettersson <[EMAIL PROTECTED]>**20050512190248
The problem was fixed in the patch:
Tue Apr 26 02:47:50 CEST 2005 Benedikt Schmidt <[EMAIL PROTECTED]>
* fix problem when editing long comments with nvi
]
[Cope with older GHCs that don't have createDirectoryIfMissing
Ian Lynagh <[EMAIL PROTECTED]>**20050513232827]
[Remove slurpy writing from Match
Ian Lynagh <[EMAIL PROTECTED]>**20050513001914]
[Functions to copy partial pristines and directory trees
Ian Lynagh <[EMAIL PROTECTED]>**20050512234741]
[Provide createPristineFromWorking rather than writePristine
Ian Lynagh <[EMAIL PROTECTED]>**20050512211422]
[Remove now-unused mmap_slurp_all_but_darcs
Ian Lynagh <[EMAIL PROTECTED]>**20050512200516]
[Remove more slurpy stuff from Get
Ian Lynagh <[EMAIL PROTECTED]>**20050512200453]
[Implement cloneTreeExcept
Ian Lynagh <[EMAIL PROTECTED]>**20050512195156]
[Remove some slurpy writing from Get
Ian Lynagh <[EMAIL PROTECTED]>**20050512194727]
[Use withRecorded in Dist
Ian Lynagh <[EMAIL PROTECTED]>**20050512015113]
[Rejig createPristineDirectoryTree for easier reuse
Ian Lynagh <[EMAIL PROTECTED]>**20050511182848]
[cloneTree now wants an existing directory as dest, rather than non-existing
Ian Lynagh <[EMAIL PROTECTED]>**20050511182055]
[Use withRecorded in TrackDown
Ian Lynagh <[EMAIL PROTECTED]>**20050511175827]
[Use withRecorded in Repository
Ian Lynagh <[EMAIL PROTECTED]>**20050511175814]
[Don't read tempdir_loc if we don't need it
Ian Lynagh <[EMAIL PROTECTED]>**20050510211725]
[Remove the = in a flag to make old ghc's happy
Ian Lynagh <[EMAIL PROTECTED]>**20050513141859]
[Remove a FIXME comment that has been fixed
Ian Lynagh <[EMAIL PROTECTED]>**20050513011105]
[some new ChangeLog entries
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512210508]
[make_changelog.hs: use renderStyle instead of show, etc
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512210424]
[make_changelog.hs: use fsep to word-wrap ChangeLog entries
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512201026]
[resolve conflict with unstable unit testing stuff.
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512095945]
[make_changelog.hs: make stylistic changes suggested by Ian Lynagh
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512093732]
[make_changelog.hs: use match_parser in entry for better error messages
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512093718]
[make_changelog.hs: use formatCalendarTime to show tag dates
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512085640]
[export match_parser from PatchMatch
Tomasz Zielonka <[EMAIL PROTECTED]>**20050512083548]
[automatically generate ChangeLog if we're in a darcs repository.
David Roundy <[EMAIL PROTECTED]>**20050511112615]
[bugfix - make ChangeLog creation really atomic
Tomasz Zielonka <[EMAIL PROTECTED]>**20050511213435]
[make_changelog: don't warn about unmatched entries when there are none
Tomasz Zielonka <[EMAIL PROTECTED]>**20050511205602]
[fix failure to compile make_changelog with ghc 6.4
David Roundy <[EMAIL PROTECTED]>**20050511112227
(multiple imports of liftM etc).
]
[make ChangeLog generation atomic
Tomasz Zielonka <[EMAIL PROTECTED]>**20050511204254]
[Created file for ChangeLog entries added by myself
Tomasz Zielonka <[EMAIL PROTECTED]>**20050511144029]
[convert ChangeLog entries since 1.0.2 to a ChangeLog entry database format
Tomasz Zielonka <[EMAIL PROTECTED]>**20050511104044]
[auto-generate ChangeLog
Tomasz Zielonka <[EMAIL PROTECTED]>**20050511104006
ChangeLog is generated from a database of ChangeLog entries and current
repo history. Each ChangeLog entry consists of a description and a set
of PatchMatch matchers. The entry goes into the ChangeLog as soon as all
the matchers are satisfied.
]
[add make_changelog, a tool to auto-generate ChangeLog
Tomasz Zielonka <[EMAIL PROTECTED]>**20050511100512]
[write about dependencies, branches, conflicts and merging in best_practices
Tommy Pettersson <[EMAIL PROTECTED]>**20050511151349]
[Implement withRecorded
Ian Lynagh <[EMAIL PROTECTED]>**20050511174853]
[Use withRecorded in Test
Ian Lynagh <[EMAIL PROTECTED]>**20050511013028]
[Be more sensible with exceptions from getSymbolicLinkStatus
Ian Lynagh <[EMAIL PROTECTED]>**20050511002356]
[Replace test_slurpy with test_patch
Ian Lynagh <[EMAIL PROTECTED]>**20050510225229]
[Remove slurp_write_dirty and slurp_write_and_read_dirty
Ian Lynagh <[EMAIL PROTECTED]>**20050509221350]
[Eliminate slurp_write_and_read_dirty from Match
Ian Lynagh <[EMAIL PROTECTED]>**20050509220731]
[Eliminate slurp_write_dirty from Apply
Ian Lynagh <[EMAIL PROTECTED]>**20050509215506]
[Eliminate slurp_write_dirty from Resolve
Ian Lynagh <[EMAIL PROTECTED]>**20050509215033]
[Eliminate slurp_write_dirty from Pull
Ian Lynagh <[EMAIL PROTECTED]>**20050509214359]
[Remove write_dirty_Pristine
Ian Lynagh <[EMAIL PROTECTED]>**20050509211958]
[Eliminate write_dirty_Pristine from Unrecord
Ian Lynagh <[EMAIL PROTECTED]>**20050509211418]
[Eliminate write_dirty_Pristine from Rollback
Ian Lynagh <[EMAIL PROTECTED]>**20050509210924]
[Eliminate write_dirty_Pristine from Pull
Ian Lynagh <[EMAIL PROTECTED]>**20050509210454]
[Eliminate slurp_write_dirty from Revert
Ian Lynagh <[EMAIL PROTECTED]>**20050509205619]
[Eliminate slurp_write_dirty from Unrevert
Ian Lynagh <[EMAIL PROTECTED]>**20050509205051]
[Eliminate slurp_write_dirty from Unrecord
Ian Lynagh <[EMAIL PROTECTED]>**20050509203955]
[Eliminate slurp_write_dirty from Replace
Ian Lynagh <[EMAIL PROTECTED]>**20050509195038]
[Eliminate write_dirty_Pristine from AmendRecord
Ian Lynagh <[EMAIL PROTECTED]>**20050508160258]
[Eliminate slurp_write_dirty from Trackdown
Ian Lynagh <[EMAIL PROTECTED]>**20050508151427]
[Eliminate write_dirty_Pristine from Apply
Ian Lynagh <[EMAIL PROTECTED]>**20050508150729]
[Eliminate slurp_write_dirty from Get
Ian Lynagh <[EMAIL PROTECTED]>**20050508145207]
[Remove doubled space
Ian Lynagh <[EMAIL PROTECTED]>**20050508125407]
[allow my-home-relative ssh paths
[EMAIL PROTECTED]
[fix the test for unset variable
[EMAIL PROTECTED]
[remove my local path
[EMAIL PROTECTED]
[make sure darcs binary dir is on path, move EDITME variables to the top
[EMAIL PROTECTED]
[prefix putty binary dir to path
[EMAIL PROTECTED]
[fix cygwin-wrapper.bash to not convert ssh "remote location" arguments
[EMAIL PROTECTED]
[TAG darcs unstable 2005-05-09
Ian Lynagh <[EMAIL PROTECTED]>**20050509222002]
Patch bundle hash:
d424d13caa27cabb69155372b104592eafe08c88
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
