mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
30116 commits 13 branches 442 tags 103 MiB
Commit graph

415 commits

Author SHA1 Message Date
Joey Hess
a419a56c45 EvilSplicer hacks for persistent 2015-02-22 15:43:59 -04:00
Joey Hess
21cab904a9 remove now duplicate import 2015-02-19 18:45:07 -04:00
Joey Hess
88fbb13ee3 Linux standalone: Improved process names of linker shimmed programs. 2015-02-16 19:36:26 -04:00
Joey Hess
02cdc2f0b7 typo 2015-01-29 13:51:30 -04:00
Joey Hess
5fe41d3ef5 windows: include html help file that msysgit tries to open for git annex --help 
Pointing to the website is easier than trying to format the man page to
html on windows.

Closes https://github.com/datalad/datalad/issues/39
 2015-01-29 13:43:52 -04:00
Joey Hess
f61d891f2e weirdly doubled slashes 2015-01-29 13:34:14 -04:00
Joey Hess
349eefc768 make commits to downloads repo with the git-annex distribution signing key 2015-01-21 21:27:12 -04:00
Joey Hess
afc5153157 update my email address and homepage url 2015-01-21 12:50:09 -04:00
Joey Hess
a92737c8b9 Fix build failure when wget is not installed. 2015-01-15 15:42:15 -04:00
Joey Hess
596b8e1e04 fix DistributionUpdate incompatability 
Since DistributionUpdate builds an Annex object, the new relative paths
code caused it to make a git object with paths like ../lib/downloads.
However, it actually runs the system's installed git-annex, and that old
version did not like being run in this situation. Probably it was buggy.

Fixed by chdir to the downloads repo before doing anything else.
 2015-01-13 12:43:22 -04:00
Joey Hess
3bab5dfb1d revert parentDir change 
Reverts 965e106f24

Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
 2015-01-09 13:11:56 -04:00
Joey Hess
08a26575e3 added android 5.0 build 2015-01-08 19:29:17 -04:00
Joey Hess
965e106f24 made parentDir return a Maybe FilePath; removed most uses of it 
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /

This commit was sponsored by Audric SCHILTKNECHT.
 2015-01-06 18:55:56 -04:00
Joey Hess
c64ede23cd Use wget -q --show-progress for less verbose wget output, when built with wget 1.16. 2014-12-16 14:04:40 -04:00
Joey Hess
e292310ba3 Windows: Install ssh and other bundled programs to Git/cmd, instead of Git/bin, since the latter is not in the default msysgit PATH. 2014-12-03 13:34:13 -04:00
Joey Hess
10b139956a Windows: ssh is no longer included in the git-annex bundle, since msysgit includes it. 2014-12-03 13:26:05 -04:00
Joey Hess
31c2ece395 Windows: Remove Alt+A keyboard shortcut, which turns out to have scope outside the menus. 2014-11-14 13:56:05 -04:00
Joey Hess
c9c01680e6 annex new files 2014-11-11 16:49:24 -04:00
Joey Hess
04ca336b8e OSX autobuilder updated to 10.10 2014-11-11 16:18:51 -04:00
Joey Hess
9fd95d9025 indent with tabs not spaces 
Found these with:
git grep "^  " $(find -type  f -name \*.hs) |grep -v ':  where'

Unfortunately there is some inline hamlet that cannot use tabs for
indentation.

Also, Assistant/WebApp/Bootstrap3.hs is a copy of a module and so I'm
leaving it as-is.
 2014-10-09 15:09:26 -04:00
Joey Hess
7b50b3c057 fix some mixed space+tab indentation 
This fixes all instances of " \t" in the code base. Most common case
seems to be after a "where" line; probably vim copied the two space layout
of that line.

Done as a background task while listening to episode 2 of the Type Theory
podcast.
 2014-10-09 15:09:11 -04:00
Joey Hess
2815a34baf fix build 2014-08-31 07:57:07 -07:00
Joey Hess
6eb5c3f479 Do not preserve permissions and acls when copying files from one local git repository to another. Timestamps are still preserved as long as cp --preserve=timestamps is supported. 
This avoids cp -a overriding the default mode acls that the user might have
set in a git repository.

With GNU cp, this behavior change should not be a breaking change, because
git-anex also uses rsync sometimes in the same situation, and has only ever
preserved timestamps when using rsync.

Systems without GNU cp will no longer use cp -a, but instead just cp.
So, timestamps will no longer be preserved. Preserving timestamps when
copying between repos is not guaranteed anyway.

Closes: #729757
 2014-08-26 17:10:25 -07:00
Joey Hess
b3a9d41910 fix build 2014-08-10 19:44:09 -04:00
Joey Hess
5afc8b28e0 move git-annex to git/cmd 
This way, it works both when using msgit, which will look in both bin and
cmd, but also when using cygwin's git, which only looks in PATH, which
includes cmd but not bin.
 2014-07-16 18:12:05 -04:00
Joey Hess
a6fdc4b3bc Windows: Move .vbs files out of git\bin 
.. To avoid that being in the PATH, which caused some weird breakage.
(Thanks, divB)
 2014-07-16 18:00:07 -04:00
Joey Hess
3a7ae6f144 indentation 2014-07-13 22:33:27 -04:00
Joey Hess
4396d3100c typo 2014-07-07 14:30:38 -04:00
Joey Hess
4a86430567 windows autobuild images now available from downloads.kitenet.net 
The autobuilder's own https cert is expired.
 2014-06-19 14:21:34 -04:00
Joey Hess
c7cbd6488c
fix generation of infor files 
Now have files relative to the top of the repo.
 2014-06-18 16:34:28 -04:00
Joey Hess
77e490108b
fix build-version url 2014-06-18 16:24:46 -04:00
Joey Hess
4797db5c8f silence curl 2014-06-18 16:17:57 -04:00
Joey Hess
90933360de
couple bug fixes in build-version code 2014-06-18 16:11:20 -04:00
Joey Hess
0994f4a814 fix filenames 2014-06-18 15:50:54 -04:00
Joey Hess
bd49b63aa1 fix url 2014-06-18 15:49:05 -04:00
Joey Hess
45f06f61ba better warnings 2014-06-18 15:44:16 -04:00
Joey Hess
a8daa18759 clean up unused import 2014-06-18 15:40:44 -04:00
Joey Hess
5b478722da make DistributionUpdate download build-version files and use them in the info files 
Also automated downloading the builds, finally. I had done it by hand until
now.

Note that the Windows autobuilder has an expired cert, so it will refuse to
download from it currently. I have emailed its admin to get that fixed,
hopefully.

This commit was sponsored by Peter Hogg.
 2014-06-18 15:24:18 -04:00
Joey Hess
a615817ab1 add Build/BuildVersion, for use by autobuilders 2014-06-18 14:29:39 -04:00
Joey Hess
1fcd0c8c4d don't start minimized 2014-06-17 14:28:44 -04:00
Joey Hess
a8b6ff0ff2 crazy quote for spaces 2014-06-17 14:05:31 -04:00
Joey Hess
883aa84209 windows no-DOS-box and autostart, at last 
Using the crazy but apparently best approach of a VB Script that runs
git-annex, in a hidden DOS window.

Note that currently the git-annex messages are not directed to daemon.log.
Would probably need another layer of script. Also problimatic since the
repository may not exist yet.
 2014-06-17 13:57:00 -04:00
Joey Hess
84227bd21c fix build 2014-06-13 11:14:50 -04:00
Joey Hess
4dd6938850 make EvilSplicer re-box file-embed's ByteStrings 
The armel autobuilder started failing:

Assistant/WebApp/Types.hs:128:14:
    primitive string literal must contain only characters <= '\xFF'

This fixes that.
 2014-06-13 02:18:31 -04:00
Joey Hess
37da3d7b5d
better heuristic for what is a package-qualified symbol 
Hopefully this will avoid mangling css files embedded in strings inside
spliced code.
 2014-05-27 20:12:16 -04:00
Joey Hess
346112d49a
proper fix for "foo"# -- need MagicHash extension 2014-05-25 23:27:48 -04:00
Joey Hess
062e37d201
typo 2014-05-25 23:09:45 -04:00
Joey Hess
9b7fa4ad07 put in hack for weird new problem with ghc's emitted splices 2014-05-25 23:03:44 -04:00
Joey Hess
4e987d05a8 work around an EvilSplicer bug 
This should fix the android build. The EvilSplicer cannot fix up ghc's
misformatting of a case expression with a construstor with a lot of
parameters, which spans multiple lines.
 2014-05-10 12:27:21 -03:00
Joey Hess
dc0a8b7618 Revert "add debugging for odd OOM or hang on 5 architectures, all where configure runs sha224sum" 
This reverts commit 238a935f9c.

The OOM was cabal's way of telling us it couldn't resolve dependencies.
 2014-04-22 20:23:37 -04:00
Joey Hess
1cd169e0c8
--detach-sign 2014-04-21 11:56:06 -04:00
Joey Hess
78d6aa1a49 sign files 2014-04-21 11:24:34 -04:00
Joey Hess
a10d3731b8 fix distributionupdate build 
Including avoiding needing cabal's defines for Utility.URI
 2014-04-21 10:47:26 -04:00
Joey Hess
238a935f9c add debugging for odd OOM or hang on 5 architectures, all where configure runs sha224sum 2014-04-20 19:55:08 -04:00
Joey Hess
8d45a82988 use ustar format and omit filnames with colons. new hackage requirements 
The tarball on hackage will no longer correspond to the git tag. Oh well.
 2014-04-11 18:45:46 -04:00
Joey Hess
407d60ca5d Remove wget from OSX dmg, due to issues with cert paths that broke git-annex automatic upgrading. Instead, curl is used, unless the OSX system has wget installed, which will then be used. 2014-04-10 12:54:58 -04:00
Joey Hess
611e060385 factor out library code (also used by propellor) 2014-04-03 21:25:59 -04:00
Joey Hess
fac8198a2f fix up old comments that used format=txt, which is no longer enabled 2014-03-20 12:09:09 -04:00
Joey Hess
b04f62a962 make configure -Wall clean 2014-03-10 16:59:38 -04:00
Joey Hess
7ac37a7854 Probe for quvi version at run time. 
Overhead: git annex addurl runs quvi --version once.
And more bloat to Annex state..
 2014-02-28 14:54:02 -04:00
Joey Hess
1570f00ed9 more distributionupdate fixes 2014-02-27 12:20:53 -04:00
Joey Hess
764090d58f commit before info file build, so that any modified annexed files get updated 2014-02-21 12:13:12 -04:00
Joey Hess
f11f7520b5 windows: Fix process termination code. 
The ctrl-c hack used before didn't actually seem to work.

No haskell libraries expose TerminateProcess. I tried just calling it via
FFI, but got segfaults, probably to do with the wacky process handle not
being managed correctly. Moving it all into one C function worked.

This was hell. The EvilLinker hack was just final icing on the cake.
We all know what the cake was made of.
 2014-02-13 15:53:10 -04:00
Joey Hess
de3aaa9eb0 fix info file finding 2014-02-10 15:33:37 -04:00
Joey Hess
e4d7358389
check for out of date info files at end 2014-02-10 15:28:00 -04:00
Joey Hess
d8c1890c98 deal with multiarch 2014-02-07 17:20:29 -04:00
Joey Hess
7dd94c0846 remove debug info 2014-01-30 13:34:24 -04:00
Joey Hess
ff6854e5b4 fix install_name_tool library name replacement 2014-01-15 13:05:07 -04:00
Joey Hess
465a24cc54 fix warning 2014-01-14 16:44:04 -04:00
Joey Hess
d0b51099a4 search DYLD_LIBRARY_PATH for libraries 2014-01-14 16:28:05 -04:00
Joey Hess
5a5adc44f5 Refuse to build with git older than 1.7.1.1, which is needed for git checkout -B 2014-01-13 15:17:48 -04:00
Joey Hess
22d6019bae add back sha commands on OSX; SIGILL problem fixed 2014-01-06 16:11:21 -04:00
Joey Hess
1118247394 OSX: Avoid using external hash programs, since SIGILL is not fun 2014-01-01 16:26:43 -04:00
Joey Hess
2c27b1397b windows: add more libraries, these are used by gpg 2014-01-01 15:30:58 -04:00
Joey Hess
04860fe3e9 include libgcc_s in case not pulled in by ldd 
libc can demand-load libgcc_s in some situations, it seems
 2013-12-31 15:08:26 -04:00
Joey Hess
72b592cdae Revert "include libgcc in linux standalone" 
This reverts commit 9f82e0c64d.

ldd pulls it in
 2013-12-31 14:36:55 -04:00
Joey Hess
9f82e0c64d include libgcc in linux standalone 2013-12-31 14:23:49 -04:00
Joey Hess
326bc7491d add main type sig 2013-12-30 13:19:22 -04:00
Joey Hess
80152e1aa3 add git-shell binary to bundles 2013-12-27 16:35:24 -04:00
Joey Hess
6c3e11abaf avoid another encoding crash 2013-12-27 00:10:04 -04:00
Joey Hess
63fab93755 -Wall clean 2013-12-27 00:05:15 -04:00
Joey Hess
bd106e22f1 clean up 2013-12-24 17:42:48 -04:00
Joey Hess
706c74aa98 Include git-receive-pack, git-upload-pack, and git wrappers in the Linux standalone build, and OSX app, so they will be available when it's added to PATH. 2013-12-24 16:28:10 -04:00
Joey Hess
b9d3cfa0c5 fix gconvdir 2013-12-24 16:28:03 -04:00
Joey Hess
02df4f529b Fix bug in Linux standalone build's shimming that broke git-annex-shell. 2013-12-24 15:42:49 -04:00
Joey Hess
e199240ab8 remove unused imports 2013-12-24 15:18:15 -04:00
Joey Hess
103c7e8b9a resursively follow lib symlinks, just in case 2013-12-24 13:25:02 -04:00
Joey Hess
5897fb4a86 convert hacky shell linux mklibs code to haskell ; fixing symlink bug 
The shell code was nasty, and buggy. New haskell code is much nicer,
and it's easy to do complicated calculations to properly convert possibly
absolute symlinks between libraries into relative links using it.
 2013-12-24 13:13:17 -04:00
Joey Hess
abffc91575 fix build 
Need to recurse into subdirs to follow git-annex links.
 2013-12-21 12:37:53 -04:00
Joey Hess
46f99c7764 avoid EvilSplicer crashing on encoding problems, including LANG=C with utf-8 in files 2013-12-19 02:37:21 -04:00
Joey Hess
0027cef395 improve EvilSplicer robustness 2013-12-18 21:39:09 +00:00
Joey Hess
d7ee0bdbb8 OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by default. 2013-12-13 14:25:24 -04:00
Joey Hess
cb37a45e29 argh, one more 2013-12-11 11:53:56 -04:00
Joey Hess
2cca8760fc more 2013-12-11 11:49:35 -04:00
Joey Hess
a9cb8d02f6 one more lib 2013-12-11 11:44:14 -04:00
Joey Hess
439d4a8c42 yet more wget and curl libs 2013-12-11 11:34:22 -04:00
Joey Hess
174b1275ee more libs for wget and curl 2013-12-11 11:23:39 -04:00
Joey Hess
64379ff59e add libs needed by wget and curl 2013-12-11 11:10:30 -04:00
Joey Hess
6c1a50b4ea fix EvilLinker to not stomp on environment 2013-12-10 14:21:22 -04:00
Joey Hess
2b13776449 remove debug 2013-12-10 13:56:08 -04:00
Joey Hess
5315efa3d6 parse out additional env vars when running collect2 2013-12-10 13:51:52 -04:00
Joey Hess
656ae5f823 try setting TMPDIR for collect2 to not use C:\Windows 2013-12-10 12:53:37 -04:00
Joey Hess
5f859e648c debug 2013-12-10 12:50:04 -04:00
Joey Hess
902d14b2ee remove debug 2013-12-10 12:43:42 -04:00
Joey Hess
8ce7b9d222 typo 2013-12-10 00:37:58 -04:00
Joey Hess
cd765576d2 remove menu item on uninstall 2013-12-10 00:37:06 -04:00
Joey Hess
db8a980c70 request admin rights at install 2013-12-10 00:32:08 -04:00
Joey Hess
29f440289b start minimized 2013-12-10 00:26:14 -04:00
Joey Hess
7d9b3e9598 fixes 2013-12-10 00:17:20 -04:00
Joey Hess
1d0f77fca2 try to make a start menu shortcut 2013-12-10 00:13:15 -04:00
Joey Hess
15fda7f452 fix infinite recursion on failed parse 2013-12-09 15:34:56 -04:00
Joey Hess
0e729fdff6 wall clean 2013-12-09 15:28:33 -04:00
Joey Hess
5017523183 record output to file 2013-12-09 15:22:53 -04:00
Joey Hess
d5981949e0 detect parse failure where command is somehow empty (wtf?) 2013-12-09 15:17:55 -04:00
Joey Hess
c737299ebf more horrible path fixup 2013-12-08 15:42:27 -04:00
Joey Hess
fc40432cff typo 2013-12-07 11:18:02 -04:00
Joey Hess
50f4f2b1ef debug 2013-12-07 11:14:54 -04:00
Joey Hess
24469a7d54 lose the -v2, unneeded 2013-12-07 11:13:02 -04:00
Joey Hess
5cdd933117 improve debuggin on failure 2013-12-06 18:50:13 -04:00
Joey Hess
ce3f5138c2 improve parser robustness 2013-12-06 18:26:52 -04:00
Joey Hess
db26e3c4de try to fix collect2 output parser 2013-12-06 18:06:39 -04:00
Joey Hess
fee56536dc more verbose cabal 2013-12-06 17:38:41 -04:00
Joey Hess
ec090f609f more paths 2013-12-06 15:24:39 -04:00
Joey Hess
5a03e1cacc better output 2013-12-06 15:18:13 -04:00
Joey Hess
1910795ddf error reporting 2013-12-06 15:15:47 -04:00
Joey Hess
b370f52f88 use EvilLinker on autobuilder (will probably need some more horrible path fixes) 2013-12-06 15:08:30 -04:00
Joey Hess
48b4650520 aaargh 2013-12-06 14:58:26 -04:00
Joey Hess
dea7dedaf8 more path mangling, because DOS 2013-12-06 14:46:32 -04:00
Joey Hess
3b3276988c propigate ld failure 2013-12-06 14:29:58 -04:00
Joey Hess
b97fe204ba progress 2013-12-06 14:20:44 -04:00
Joey Hess
5b5c33e06d pass COLLECT_GCC_OPTIONS 2013-12-06 13:53:58 -04:00
Joey Hess
237f72990e now it gets truely nightmarish 2013-12-06 13:39:35 -04:00
Joey Hess
a5644eeeb9 gcc output parser 2013-12-06 13:27:29 -04:00
Joey Hess
0bf516d018 foo 2013-12-06 13:14:01 -04:00
Joey Hess
6b30b66160 mangle \ in paths (sheesh) 2013-12-06 12:55:32 -04:00
Joey Hess
598dc56222 update 2013-12-06 12:48:39 -04:00
Joey Hess
03f0fa1f2f debug 2013-12-06 12:44:40 -04:00
Joey Hess
639808658d EvilLinker stage 2 2013-12-06 12:43:30 -04:00
Joey Hess
01799cafc3 EvilLinker, stage 1 2013-12-06 12:27:21 -04:00
Joey Hess
0d91432442 test for nocache at configure time 2013-12-01 15:12:32 -04:00
Joey Hess
4882a611e5 assistant: Batch jobs are now run with ionice and nocache, when those commands are available. 2013-12-01 14:53:15 -04:00
Joey Hess
3a80ab53f4 fix 2 commands 2013-11-25 14:14:45 -04:00
Joey Hess
e2f50f5110 Added support for quvi 0.9. Slightly suboptimal due to limitations in its interface compared with the old version. 2013-11-24 23:44:30 -04:00
Joey Hess
fead2941cd linux upgrade code debugged and working 2013-11-24 00:26:20 -04:00
Joey Hess
0e8e684d6c no-op change to ensure configure is re-run on autobuilders to pick up UPGRADE_LOCATION 2013-11-22 15:25:42 -04:00
Joey Hess
d0e063e618 improve commit message 2013-11-22 15:05:00 -04:00
Joey Hess
8ff858edfa sync files to website too 2013-11-22 15:02:31 -04:00
Joey Hess
3f85d851bb use .info, allow multiple info files in same directory 2013-11-22 14:59:01 -04:00
Joey Hess
f10daec794 distribution info file updater program 2013-11-22 12:21:53 -04:00
Joey Hess
e2f17e9da3 upgrade alerts 
The webapp will check twice a day, when the network is connected, to see if
it can download a distributon upgrade file. If a newer version is found,
display an upgrade alert.

This will need the autobuilders to set UPGRADE_LOCATION to the url
it can be downloaded from when building git-annex. Only builds with that
set need automatic upgrade alerts.

Currently, the upgrade page just requests the user manually download
and upgrade it. But, all the info is provided to do automated upgrades
in the future.

Note that urls used will need to all be https.

This commit was sponsored by Dirk Kraft.
 2013-11-21 17:49:56 -04:00