Joey Hess
b505ba83e8
minor syntax changes
2011-10-11 14:43:45 -04:00
Joey Hess
025ded4a2d
tweaks
2011-10-10 17:37:44 -04:00
Joey Hess
f0153f9fd7
fix a race
...
Another process may stage journalled files before the lock is
taken, so need to get the list of journalled files afterwards.
It's unfortunate this means getting the directory contents twice,
but it seems better to do that than sometimes take the lock
unnecessarily.
2011-10-09 16:19:09 -04:00
Joey Hess
dfee6e1ed6
better layout
...
And a theoretical fix to branchstate cache invalidation, but not a bug
that could actually happen.
2011-10-07 13:59:34 -04:00
Joey Hess
82e655efd0
performance fix
...
It was checking if it needed to merge on every branch access, fix it to
only check once.
2011-10-07 13:38:56 -04:00
Joey Hess
44fc358885
avoid merging multiple branches that point to the same tree
...
avoids git warning "error: duplicate parent xxx ignored"
2011-10-07 13:37:01 -04:00
Joey Hess
3acdba3995
faster union merge of multiple branches into index
...
only write index once
2011-10-07 13:36:48 -04:00
Joey Hess
6a6ea06cee
rename
2011-10-05 16:02:51 -04:00
Joey Hess
cfe21e85e7
rename
2011-10-04 00:59:08 -04:00
Joey Hess
ff21fd4a65
factor out Annex exception handling module
2011-10-04 00:34:04 -04:00
