SuccessChanges

Summary

  1. Add PullOp test cases for pulling from non configured remotes (details)
  2. Make fetch and pull respect the refspecs specified by the remote configs (details)
Commit 77c1281b8b58eaf740a979fed4141436ab95e580 by groldan
Add PullOp test cases for pulling from non configured remotes
Signed-off-by: Gabriel Roldan <groldan@boundlessgeo.com>
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/PullOp.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/PullOpTest.java (diff)
Commit 21a21c44b6741d756f154b2a7027c19270a855fd by groldan
Make fetch and pull respect the refspecs specified by the remote configs
Fixes issues related to filtering which refs are fetch and where they
are placed on the local repository:
- Fetch didn't have a way to fetch a single ref or a subset of refs from
a remote, it always fetched them all.
- Fetch didn't respect the [+]<remote>:[local] remote refspec config
(Remote.fetch property), and assumed allways
+refs/heads/*:refs/remotes/<remote>/*
- Hence, pull wasn't able to fetch only the required branch, but got
everything from the remote before merging the required branch.
- Also, the semantics of pull were wrong. It is supposed to fetch the
required branch and them merge it onto the current branch. Instead, it
was creating a new local branch for each specified remote ref being
pulled.
Signed-off-by: Gabriel Roldan <groldan@boundlessgeo.com>
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/RemoteListOpTest.java (diff)
The file was addedsrc/core/src/main/java/org/locationtech/geogig/porcelain/BranchResolveOp.java
The file was addedsrc/api/src/main/java/org/locationtech/geogig/repository/LocalRemoteRefSpec.java
The file was modifiedsrc/core/src/main/java/org/locationtech/geogig/plumbing/FindCommonAncestor.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/pack/MapRef.java (diff)
The file was modifiedsrc/web/functional/src/test/java/org/geogig/web/functional/RunFunctionalTest.java (diff)
The file was modifiedsrc/web/api/src/test/java/org/locationtech/geogig/web/api/commands/PullTest.java (diff)
The file was modifiedsrc/core/src/main/java/org/locationtech/geogig/porcelain/MergeOp.java (diff)
The file was modifiedsrc/web/functional/src/test/resources/features/commands/Cat.feature (diff)
The file was modifiedsrc/cli/src/test/resources/features/porcelain/Checkout.feature (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/pack/UpdateRemoteRefOp.java (diff)
The file was modifiedsrc/cli/src/test/resources/features/remote/Fetch.feature (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/PullResult.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/FetchOpTest.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/LsRemoteOp.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/pack/DiffRemoteRefsOp.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/pack/PushOp.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/PullOpTest.java (diff)
The file was modifiedsrc/web/functional/src/test/resources/features/repo/Manifest.feature (diff)
The file was modifiedsrc/core/src/main/java/org/locationtech/geogig/repository/impl/StagingAreaImpl.java (diff)
The file was modifiedsrc/web/functional/src/test/java/org/geogig/web/postgresql/functional/RunPGFunctionalTest.java (diff)
The file was modifiedsrc/cli/src/test/resources/features/porcelain/Branch.feature (diff)
The file was modifiedsrc/api/src/main/java/org/locationtech/geogig/model/Ref.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/RemoteRepositoryTestCase.java (diff)
The file was addedsrc/api/src/test/java/org/locationtech/geogig/repository/LocalRemoteRefSpecTest.java
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/PullOp.java (diff)
The file was modifiedsrc/cli/src/test/resources/features/remote/Pull.feature (diff)
The file was modifiedsrc/core/src/test/java/org/locationtech/geogig/test/TestSupport.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/CloneOpTest.java (diff)
The file was modifiedsrc/web/functional/src/test/resources/features/commands/Pull.feature (diff)
The file was modifiedsrc/core/src/test/java/org/locationtech/geogig/test/integration/MergeOpTest.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/pack/FetchOp.java (diff)
The file was modifiedsrc/web/functional/src/test/java/org/geogig/web/functional/InitFunctionalTest.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/CloneOp.java (diff)
The file was modifiedsrc/core/src/main/java/org/locationtech/geogig/plumbing/merge/CheckMergeScenarioOp.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/RemoteAddOpTest.java (diff)
The file was modifiedsrc/api/src/main/java/org/locationtech/geogig/repository/DefaultProgressListener.java (diff)
The file was modifiedsrc/api/src/main/java/org/locationtech/geogig/repository/Remote.java (diff)
The file was modifiedsrc/web/functional/src/test/java/org/geogig/web/functional/MissingResolversTest.java (diff)
The file was modifiedsrc/core/src/main/java/org/locationtech/geogig/porcelain/RebaseOp.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/RemoteRemoveOpTest.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/pack/RefRequest.java (diff)
The file was modifiedsrc/cli/src/test/resources/features/porcelain/Remote.feature (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/RemoteAddOp.java (diff)
The file was modifiedsrc/remoting/src/test/java/org/locationtech/geogig/test/integration/remoting/BranchListOpTest.java (diff)
The file was modifiedsrc/remoting/src/main/java/org/locationtech/geogig/remotes/FetchOp.java (diff)