github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2024-11-22 12:27:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #285 from oranja/pkg-uptodate

Browse Source 
omf update: Report up-to-date packages as such
This commit is contained in:
Derek Willian Stavis 2016-03-27 21:57:28 -03:00
commit 0699c9ff40
2 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/omf/functions/packages/omf.packages.update.fish
View File

@ -1,19 +1,24 @@
function omf.packages.update -a name
if set target_path (omf.packages.path $name)
# Skip packages outside version control
not test -e $target_path/.git;
and return 0
if omf.repo.pull $target_path
omf.bundle.install $target_path/bundle
echo (omf::em)"$name successfully updated."(omf::off)
return 0
else
echo (omf::err)"Could not update $name."(omf::off) 1^&2
end
else
echo (omf::err)"Could not find $name."(omf::off) 1^&2
if not set target_path (omf.packages.path $name)
echo (omf::err)"Could not find $name."(omf::off) 1>&2
return 1
end
return 1
# Skip packages outside version control
not test -e $target_path/.git;
and return 0
omf.repo.pull $target_path
switch $status
case 0
omf.bundle.install $target_path/bundle
echo (omf::em)"$name successfully updated."(omf::off)
case 1
echo (omf::err)"Could not update $name."(omf::off) 1>&2
return 1
case 2
echo (omf::dim)"$name is already up-to-date."(omf::off)
end
return 0
end

56
pkg/omf/functions/repo/omf.repo.pull.fish
View File

@ -1,61 +1,63 @@
function omf.repo.pull
if test (count $argv) -eq 0
echo (omf::err)"Argument of omf.repo.pull is the repo path."(omf::off)
echo (omf::err)"omf.repo.pull takes a repository path as an argument."(omf::off) 1>&2
return $OMF_MISSING_ARG
end
set -l repo_dir $argv[1]
function omf.repo.git -V repo_dir
command git --git-dir "$repo_dir"/.git --work-tree "$repo_dir" $argv
end
function omf.repo.git.stash -V repo_dir
command git -C "$repo_dir" stash $argv
function __omf.repo.git -V repo_dir
command git -C "$repo_dir" $argv
end
set -l remote origin
if test (omf.repo.git config --get remote.upstream.url)
if test (__omf.repo.git config --get remote.upstream.url)
set remote upstream
end
set initial_branch (omf.repo.git symbolic-ref -q --short HEAD);
or return $OMF_UNKNOWN_ERR
set initial_revision (omf.repo.git rev-parse -q --verify HEAD);
or return $OMF_UNKNOWN_ERR
set initial_branch (__omf.repo.git symbolic-ref -q --short HEAD);
or return 1
set initial_revision (__omf.repo.git rev-parse -q --verify HEAD);
or return 1
if not omf.repo.git diff --quiet
# the refspec ensures that '$remote/master' gets updated
set -l refspec "refs/heads/master:refs/remotes/$remote/master"
__omf.repo.git fetch --quiet $remote $refspec;
or return 1
if test (__omf.repo.git rev-list --count master...FETCH_HEAD) -eq 0
return 2
end
if not __omf.repo.git diff --quiet
echo (omf::em)"Stashing your changes:"(omf::off)
omf.repo.git status --short --untracked-files
omf.repo.git.stash save --include-untracked --quiet;
__omf.repo.git status --short --untracked-files
__omf.repo.git stash save --include-untracked --quiet;
and set stashed
end
if test "$initial_branch" != master
omf.repo.git checkout master --quiet
__omf.repo.git checkout master --quiet
end
set -l refspec "refs/heads/master:refs/remotes/$remote/master"
# the refspec ensures that '$remote/master' gets updated
if not omf.repo.git pull --ff-only --quiet $remote $refspec
omf.repo.git checkout $initial_branch
omf.repo.git reset --hard $initial_revision
set -q stashed; and omf.repo.git.stash pop
if not __omf.repo.git merge --ff-only --quiet FETCH_HEAD
__omf.repo.git checkout $initial_branch
__omf.repo.git reset --hard $initial_revision
set -q stashed; and __omf.repo.git stash pop
return 1
end
if test "$initial_branch" != master
omf.repo.git checkout $initial_branch --quiet
__omf.repo.git checkout $initial_branch --quiet
end
if set -q stashed
omf.repo.git.stash pop --quiet
__omf.repo.git stash pop --quiet
echo (omf::em)"Restored your changes:"(omf::off)
command git -C "$repo_dir" status --short --untracked-files
__omf.repo.git status --short --untracked-files
end
functions -e omf.repo.git{,.stash}
return 0
end