transitioned checkout, free, update, register

added merge functionality

base/pkg/dir.jl

@@ -3,7 +3,7 @@
 module Dir
 
 import ..Pkg: DEFAULT_META, META_BRANCH
-import ..LibGit2, ..LibGit2.with_libgit2
+import ..LibGit2, ..LibGit2.with
 
 const DIR_NAME = ".julia"
 
@@ -46,7 +46,7 @@ function init(meta::AbstractString=DEFAULT_META, branch::AbstractString=META_BRA
  temp_dir = mktempdir(dir)
  Base.cd(temp_dir) do
  info("Cloning METADATA from $meta")
- with_libgit2(LibGit2.clone(meta, "METADATA", branch = branch)) do metadata_repo
+ with(LibGit2.clone(meta, "METADATA", branch = branch)) do metadata_repo
  LibGit2.set_remote_url(metadata_repo, meta)
  end
  touch("REQUIRE")

base/pkg/entry.jl

@@ -212,23 +212,22 @@ function clone(url_or_pkg::AbstractString)
  clone(url,pkg)
 end
 
-function _checkout(pkg::AbstractString, what::AbstractString, merge::Bool=false, pull::Bool=false, branch::Bool=false)
- Git.transact(dir=pkg) do #TODO: finish restore()
- Git.dirty(dir=pkg) && error("$pkg is dirty, bailing")
- branch ? Git.run(`checkout -q -B $what -t origin/$what`, dir=pkg) : Git.run(`checkout -q $what`, dir=pkg)
- merge && Git.run(`merge -q --ff-only $what`, dir=pkg)
- if pull
- info("Pulling $pkg latest $what...")
- Git.run(`pull -q --ff-only`, dir=pkg)
- end
- resolve()
- end
-end
-
 function checkout(pkg::AbstractString, branch::AbstractString, merge::Bool, pull::Bool)
  ispath(pkg,".git") || error("$pkg is not a git repo")
  info("Checking out $pkg $branch...")
- _checkout(pkg,branch,merge,pull,true)
+ LibGit2.with(LibGit2.GitRepo, pkg) do r
+ LibGit2.transact(r) do repo
+ LibGit2.isdirty(repo) && error("$pkg is dirty, bailing")
+ LibGit2.branch!(repo, branch, track=LibGit2.GitConst.REMOTE_ORIGIN)
+ merge && LibGit2.merge!(repo) # merge changes
+ if pull
+ info("Pulling $pkg latest $branch...")
+ LibGit2.fetch(repo)
+ LibGit2.merge!(repo)
+ end
+ resolve()
+ end
+ end
 end
 
 function free(pkg::AbstractString)
@@ -245,7 +244,11 @@ function free(pkg::AbstractString)
  for ver in vers
  sha1 = avail[ver].sha1
  LibGit2.iscommit(sha1, repo) || continue
- return _checkout(pkg, sha1)
+ return LibGit2.transact(repo) do r
+ LibGit2.isdirty(repo) && error("$pkg is dirty, bailing")
+ LibGit2.checkout!(repo, sha1)
+ resolve()
+ end
  end
  isempty(Cache.prefetch(pkg, Read.url(pkg), [a.sha1 for (v,a)=avail])) && continue
  error("can't find any registered versions of $pkg to checkout")
@@ -306,18 +309,22 @@ end
 function update(branch::AbstractString)
  info("Updating METADATA...")
  cd("METADATA") do
- if Git.branch() != branch
- Git.dirty() && error("METADATA is dirty and not on $branch, bailing")
- Git.attached() || error("METADATA is detached not on $branch, bailing")
- Git.run(`fetch -q --all`)
- Git.run(`checkout -q HEAD^0`)
- Git.run(`branch -f $branch refs/remotes/origin/$branch`)
- Git.run(`checkout -q $branch`)
+ with(GitRepo, ".") do repo
+ with(LibGit2.head(repo)) do h
+ if LibGit2.branch(h) != branch
+ LibGit2.isdirty(repo) && error("METADATA is dirty and not on $branch, bailing")
+ LibGit2.isattached(repo) || error("METADATA is detached not on $branch, bailing")
+ LibGit2.fetch(repo)
+ LibGit2.checkout_head(repo)
+ LibGit2.branch!(repo, branch, track="refs/remotes/origin/$branch")
+ LibGit2.merge!(repo)
+ end
+ end
  end
  # TODO: handle merge conflicts
- Base.withenv("GIT_MERGE_AUTOEDIT"=>"no") do
- Git.run(`pull --rebase -q`, out=DevNull)
- end
+ # Base.withenv("GIT_MERGE_AUTOEDIT"=>"no") do
+ #  Git.run(`pull --rebase -q`, out=DevNull)
+ # end
  end
  avail = Read.available()
  # this has to happen before computing free/fixed
@@ -332,17 +339,17 @@ function update(branch::AbstractString)
  fixed = Read.fixed(avail,instd)
  for (pkg,ver) in fixed
  ispath(pkg,".git") || continue
- begin
- if Git.attached(dir=pkg) && !Git.dirty(dir=pkg)
+ with(GitRepo, pkg) do repo
+ if LibGit2.isattached(repo) && !LibGit2.isdirty(repo)
  info("Updating $pkg...")
  @recover begin
- Git.run(`fetch -q --all`, dir=pkg)
- Git.success(`pull -q --ff-only`, dir=pkg) # suppress output
+ LibGit2.fetch(repo)
+ LibGit2.merge!(repo)
  end
  end
-  if haskey(avail,pkg)
-  Cache.prefetch(pkg, Read.url(pkg), [a.sha1 for (v,a)=avail[pkg]])
- end
+ end
+ if haskey(avail,pkg)
+ Cache.prefetch(pkg, Read.url(pkg), [a.sha1 for (v,a)=avail[pkg]])
  end
  end
  info("Computing changes...")
@@ -577,10 +584,13 @@ function register(pkg::AbstractString, url::AbstractString)
 end
 
 function register(pkg::AbstractString)
- Git.success(`config remote.origin.url`, dir=pkg) ||
- error("$pkg: no URL configured")
- url = Git.readchomp(`config remote.origin.url`, dir=pkg)
- register(pkg,Git.normalize_url(url))
+ url = LibGit2.with(LibGit2.GitRepo, pkg) do repo
+ LibGit2.with(LibGit2.GitConfig, repo) do cfg
+ LibGit2.get(cfg, "remote.origin.url", "")
+ end
+ end
+ isempty(url) || error("$pkg: no URL configured")
+ register(pkg, LibGit2.normalize_url(url))
 end
 
 function isrewritable(v::VersionNumber)

base/pkg/libgit2.jl

@@ -1,6 +1,6 @@
 module LibGit2
 
-export with_libgit2, with, with_warn
+export with, with_warn
 export GitRepo, GitConfig, GitIndex
 
 const GITHUB_REGEX =
@@ -19,6 +19,7 @@ include("libgit2/walker.jl")
 include("libgit2/remote.jl")
 include("libgit2/strarray.jl")
 include("libgit2/index.jl")
+include("libgit2/merge.jl")
 
 immutable State
  head::Oid
@@ -39,14 +40,8 @@ end
 
 """Return HEAD Oid as string"""
 function head(pkg::AbstractString)
- head_id =""
- repo = GitRepo(pkg)
- try
- head_id = string(head_oid(repo))
- catch err
- warn(err)
- finally
- finalize(repo)
+ with(GitRepo, pkg) do repo
+ string(head_oid(repo))
  end
 end
 
@@ -96,7 +91,6 @@ function isdiff(repo::GitRepo, treeish::AbstractString, paths::AbstractString=""
  result = c > 0
  finalize(diff)
  catch err
- warn(err)
  result = true
  finally
  !emptypathspec && finalize(sa)
@@ -228,7 +222,7 @@ function branch!(repo::GitRepo, branch_name::AbstractString,
  end
  end
  try
- if !isempty(track) # setup tracking
+ if !isempty(track) # setup tracking #TODO: what is branch tracks other then "origin" remote
  with(GitConfig, repo) do cfg
  set!(cfg, "branch.$branch_name.remote", GitConst.REMOTE_ORIGIN)
  set!(cfg, "branch.$branch_name.merge", name(branch_ref))
@@ -252,15 +246,13 @@ function checkout!(repo::GitRepo, commit::AbstractString = "";
  # grab head name
  head_name = GitConst.HEAD_FILE
  try
- head_ref = head(repo)
- head_name = shortname(head_ref)
- # if it is HEAD use short OID instead
- if head_name == GitConst.HEAD_FILE
- head_name = string(Oid(head_ref))
+ with(head(repo)) do head_ref
+ head_name = shortname(head_ref)
+ # if it is HEAD use short OID instead
+ if head_name == GitConst.HEAD_FILE
+ head_name = string(Oid(head_ref))
+ end
  end
- finalize(head_ref)
- catch err
- warn(err)
  end
 
  # search for commit to get a commit object
@@ -322,7 +314,7 @@ function reset!(repo::GitRepo, committish::AbstractString, pathspecs::AbstractSt
 end
 
 """ git reset [--soft | --mixed | --hard] <commit> """
-function reset!(repo::GitRepo, commit::Oid, mode::Cint = GitConst.GIT_RESET_MIXED)
+function reset!(repo::GitRepo, commit::Oid, mode::Cint = GitConst.RESET_MIXED)
 
  obj = get(GitAnyObject, repo, commit)
  obj == nothing && return
@@ -378,7 +370,7 @@ function restore(s::State, repo::GitRepo)
 
  read_tree!(idx, s.index) # restore index
  end
- reset!(repo, s.head, GitConst.GIT_RESET_SOFT) # restore head
+ reset!(repo, s.head, GitConst.RESET_SOFT) # restore head
 end
 
 function transact(f::Function, repo::GitRepo)

base/pkg/libgit2/const.jl

@@ -172,6 +172,11 @@ module GitConst
 
  const MERGE_TREE_FIND_RENAMES = Cint(1) << Cint(0)
 
+ const MERGE_FILE_FAVOR_NORMAL = Cint(0)
+ const MERGE_FILE_FAVOR_OURS = Cint(1)
+ const MERGE_FILE_FAVOR_THEIRS = Cint(2)
+ const MERGE_FILE_FAVOR_UNION = Cint(3)
+
  const MERGE_AUTOMERGE_NORMAL = Cint(0)
  const MERGE_AUTOMERGE_FAVOR_OURS = Cint(1)
  const MERGE_AUTOMERGE_FAVOR_THEIRS = Cint(2)
@@ -180,15 +185,15 @@ module GitConst
  const MERGE_NO_FASTFORWARD = Cint(1)
  const MERGE_FASTFORWARD_ONLY = Cint(2)
 
- const GIT_MERGE_ANALYSIS_NONE = 0,
- const GIT_MERGE_ANALYSIS_NORMAL = (1 << 0)
- const GIT_MERGE_ANALYSIS_UP_TO_DATE = (1 << 1)
- const GIT_MERGE_ANALYSIS_FASTFORWARD = (1 << 2)
- const GIT_MERGE_ANALYSIS_UNBORN = (1 << 3)
+ const MERGE_ANALYSIS_NONE = 0,
+ const MERGE_ANALYSIS_NORMAL = (1 << 0)
+ const MERGE_ANALYSIS_UP_TO_DATE = (1 << 1)
+ const MERGE_ANALYSIS_FASTFORWARD = (1 << 2)
+ const MERGE_ANALYSIS_UNBORN = (1 << 3)
 
- const GIT_MERGE_PREFERENCE_NONE = 0
- const GIT_MERGE_PREFERENCE_NO_FASTFORWARD = (1 << 0)
- const GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY = (1 << 1)
+ const MERGE_PREFERENCE_NONE = 0
+ const MERGE_PREFERENCE_NO_FASTFORWARD = (1 << 0)
+ const MERGE_PREFERENCE_FASTFORWARD_ONLY = (1 << 1)
 
  const DIRECTION_FETCH = Cint(0)
  const DIRECTION_PUSH = Cint(1)
@@ -211,7 +216,7 @@ module GitConst
  const GIT_REPOSITORY_STATE_APPLY_MAILBOX = Cint(8)
  const GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE = Cint(9)
 
- const GIT_RESET_SOFT = Cint(1) # Move the head to the given commit
- const GIT_RESET_MIXED = Cint(2) # SOFT plus reset index to the commit
- const GIT_RESET_HARD = Cint(3) # MIXED plus changes in working tree discarded
+ const RESET_SOFT = Cint(1) # Move the head to the given commit
+ const RESET_MIXED = Cint(2) # SOFT plus reset index to the commit
+ const RESET_HARD = Cint(3) # MIXED plus changes in working tree discarded
 end

base/pkg/libgit2/merge.jl

@@ -0,0 +1,69 @@
+function GitAnnotated(repo::GitRepo, commit_id::Oid)
+ ann_ptr_ptr = Ref{Ptr{Void}}(C_NULL)
+ @check ccall((:git_annotated_commit_lookup, :libgit2), Cint,
+ (Ptr{Ptr{Void}}, Ptr{Void}, Ptr{Oid}),
+ ann_ptr_ptr, repo.ptr, commit_id)
+ return GitAnnotated(ann_ptr_ptr[])
+end
+
+function GitAnnotated(repo::GitRepo, ref::GitReference)
+ ann_ref_ref = Ref{Ptr{Void}}(C_NULL)
+ @check ccall((:git_annotated_commit_from_ref, :libgit2), Cint,
+ (Ptr{Ptr{Void}}, Ptr{Void}, Ptr{Void}),
+ ann_ref_ref, repo.ptr, ref.ptr)
+ return GitAnnotated(ann_ref_ref[])
+end
+
+function merge_analysis(repo::GitRepo, ann::GitAnnotated)
+ analysis = Ref{Cint}(0)
+ preference = Ref{Cint}(0)
+ @check ccall((:git_merge_analysis, :libgit2), Cint,
+ (Ptr{Cint}, Ptr{Cint}, Ptr{Void}, Ptr{Ptr{Void}}, Csize_t),
+ analysis, preference, repo.ptr, Ref{Ptr{Void}}(ann.ptr), 1)
+ return analysis[], preference[]
+end
+
+function commit(ann::GitAnnotated)
+ return Oid(ccall((:git_annotated_commit_id, :libgit2), Ptr{Oid}, (Ptr{Void},), ann.ptr))
+end
+
+""" Merge changes into current head """
+function merge!(repo::GitRepo; fast_forward::Bool=false)
+ # get head annotated upstream reference
+ with(head(repo)) do hr
+ with(upstream(hr)) do hur
+ with(GitAnnotated(repo, hur)) do hua
+ ma, mp = merge_analysis(repo, hua)
+ (ma & GitConst.MERGE_ANALYSIS_UP_TO_DATE == GitConst.MERGE_ANALYSIS_UP_TO_DATE) && return
+ if (ma & GitConst.MERGE_ANALYSIS_FASTFORWARD == GitConst.MERGE_ANALYSIS_FASTFORWARD)
+ # do fastforward: checkout tree and update branch references
+ # hur_oid = Oid(hur)
+ # with(get(GitCommit, repo, hur_oid)) do cmt
+ # checkout_tree(repo, cmt)
+ # end
+ # target!(hr, hur_oid, msg="pkg.libgit2.megre!: fastforward $(name(hur)) into $(name(hr))")
+ # head!(repo, hur, msg="--fastforward")
+
+ hur_oid = Oid(hur)
+ target!(hr, hur_oid, msg="pkg.libgit2.megre!: fastforward $(name(hur)) into $(name(hr))")
+ reset!(repo, hur_oid, GitConst.RESET_HARD)
+ elseif (ma & GitConst.MERGE_ANALYSIS_NORMAL == GitConst.MERGE_ANALYSIS_NORMAL)
+ if fast_forward
+ warn("Fastforward merge is not possible. Abort merging.")
+ return
+ end
+ merge_opts = MergeOptionsStruct()
+ checkout_opts = CheckoutOptionsStruct(checkout_strategy = GitConst.CHECKOUT_SAFE)
+ @check ccall((:git_merge, :libgit2), Cint,
+ (Ptr{Void}, Ptr{Ptr{Void}}, Csize_t, Ptr{MergeOptionsStruct}, Ptr{CheckoutOptionsStruct}),
+ repo.ptr, Ref{Ptr{Void}}(hua.ptr), 1, Ref(merge_opts), Ref(checkout_opts))
+ cleanup(repo)
+ info("Review and commit merged changes.")
+ else
+ warn("Unknown merge analysis result. Merging is not possible.")
+ end
+ end
+ end
+ end
+end
+

base/pkg/libgit2/oid.jl

@@ -2,6 +2,7 @@ const OID_RAWSZ = 20
 const OID_HEXSZ = OID_RAWSZ * 2
 const OID_MINPREFIXLEN = 4
 
+#TODO: The Oid generated code should now use an immutable type that wraps an ntuple of length 20
 # immutable Oid
 # id1::UInt8
 # id2::UInt8
@@ -54,9 +55,7 @@ end
 
 function Oid(ref::GitReference)
  isempty(ref) && return Oid()
-
- typ = ccall((:git_reference_type, :libgit2), Cint, (Ptr{Void},), ref.ptr)
- typ != 1 && return Oid()
+ reftype(ref) != GitConst.REF_OID && return Oid()
  oid_ptr = ccall((:git_reference_target, :libgit2), Ptr{UInt8}, (Ptr{Void},), ref.ptr)
  oid_ptr == C_NULL && return Oid()
  return Oid(oid_ptr)