understand adjusted view branch names
An adjusted view branch has a name like "refs/heads/adjusted/views/master(author=_)(unlocked)", so it is a view branch that has been converted to an adjusted branch. Made Logs.View support such branch names. So now git-annex sync and pre-commit handle updating metadata on commit in such a branch. Much remains to be done to fully support adjusted view branches, including actually applying the adjustment when updating the view branch. Sponsored-by: Graham Spencer on Patreon
This commit is contained in:
parent
2a966f49f2
commit
cc32e31161
9 changed files with 113 additions and 79 deletions
|
@ -27,7 +27,7 @@ start :: [String] -> CommandStart
|
|||
start ps = go =<< currentView
|
||||
where
|
||||
go Nothing = giveup "Not in a view."
|
||||
go (Just v) = starting "vpop" ai si $ do
|
||||
go (Just (v, madj)) = starting "vpop" ai si $ do
|
||||
removeView v
|
||||
(oldvs, vs) <- splitAt (num - 1) . filter (sameparentbranch v)
|
||||
<$> recentViews
|
||||
|
@ -35,7 +35,8 @@ start ps = go =<< currentView
|
|||
case vs of
|
||||
(oldv:_) -> next $ do
|
||||
showOutput
|
||||
checkoutViewBranch oldv (return . branchView)
|
||||
checkoutViewBranch oldv madj
|
||||
(\v' madj' -> return (branchView v' madj'))
|
||||
_ -> next $ do
|
||||
showOutput
|
||||
inRepo $ Git.Command.runBool
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue