diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-28 16:15:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-28 16:15:50 -0400 |
| commit | 5034d8c2985dafeb141bba383ab70d75729b3cb6 (patch) | |
| tree | ac5a6dcb4f3f8aa86a5cb86fa30fa68f1b5fdcac | |
| parent | e8068f2ffbeb25bc094ecb3763da6ace278586cc (diff) | |
Modify location log parser to allow future expansion.
Since the logs have just been moved into the git-annex branch, don't need
to worry about backwards compatability with old versions of git-annex that
would fail to parse location logs with extra fields tacked on.
| -rw-r--r-- | LocationLog.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/todo/tahoe_lfs_for_reals.mdwn | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/LocationLog.hs b/LocationLog.hs index 4e2caca95..2a2bc6301 100644 --- a/LocationLog.hs +++ b/LocationLog.hs @@ -8,6 +8,8 @@ - - A line of the log will look like: "date N UUID" - Where N=1 when the repo has the file, and 0 otherwise. + - (After the UUID can optionally come a white space and other data, + - for future expansion.) - - Copyright 2010-2011 Joey Hess <joey@kitenet.net> - @@ -65,7 +67,7 @@ instance Read LogLine where -- read without an exception being thrown. -- Such lines have a status of Undefined. readsPrec _ string = - if length w == 3 + if length w >= 3 then maybe bad good pdate else bad where diff --git a/debian/changelog b/debian/changelog index 854314856..688a4adb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (3.20110625) UNRELEASED; urgency=low * Always ensure git-annex branch exists. + * Modify location log parser to allow future expansion. -- Joey Hess <joeyh@debian.org> Sun, 26 Jun 2011 21:01:06 -0400 diff --git a/doc/todo/tahoe_lfs_for_reals.mdwn b/doc/todo/tahoe_lfs_for_reals.mdwn index 4e0bf2fb1..9019767eb 100644 --- a/doc/todo/tahoe_lfs_for_reals.mdwn +++ b/doc/todo/tahoe_lfs_for_reals.mdwn @@ -19,10 +19,3 @@ location log: This way, each remote can store its own key-specfic data in the same place as other key-specific data, with minimal overhead. - -Unfortunatly, the current location log parser throws out lines that it -cannot parse, so making this change would involve something of a flag day -upgrade. Also unfortunatly, the location log and other .git-annex/ data -does not have its own version that can be checked to force an upgrade -across all clones. It might be best to deal with this at the same time -the ideas in [[branching]] are done. --[[Joey]] |