gitri

another repository of repositories implementation, inspired by git-repo, ivy and others

note that this document is a plan of operation, and that most of the commands and workflows in it are not yet implemented

Nomenclature

repository: a git (or other VCS) repository. repo is accepted shorthand.
project: A collection of repos in a specified layout. A project is defined by a manifest repo.
revset: A set of revisions of the repos in a project. They are named by the branch of the project in which they are stored.

Workflows

New Project

use git to arrange repos and stuff

     gitri init [dir]

adds repos to "index" = working copy of manifest

    gitri add

commits changes to manifest)

    gitri commit

Clone Project

    gitri clone <url> [dir] [revset]
    gitri checkout <revset>

Track server changes

fetches from all repos, rebases or merges in all changes

    gitri update

Create a new revset to work a ticket

creates a new branch in manifest

   gitri revset <new_revset> [source_revset]

use git to commit locally, change branches, etc.

   gitri develop

update local manifest file

   gitri add [-h|--hash|-b|--branch] <repo names>

commit local manifest file, push all repo branches and manifest branch

   gitri push

Porcelain Commands

init create a new gitri project
clone clone an existing gitri project
update update all repos with upstream updates (fetch followed by ?resetish command?)
checkout checkout another revset
revset create a new revset
add add a repos branch or commit to the local manifest file
push push repo changes to servers (commit (manifest) followed by repo-push and manifest-push)
status print status of all repos (--deep option for internal status)
fetch fetch all repos
commit commit everything necessary to checkout another revset, then check out the current one again, and get the same "stuff"

Future Commands

reset reset a subset of repos to the proper gitri branch
merge merge repos of other revsets into current one

Project Layout

The .gitri folder in the main repo contains the manifest repo. Revise this sentence! (Once I figure out how this is going to work)

On init, for each project in the repo, a branch called

    gitri/<project_remote>/<revset>/<remote>/<branch>

is created and checked out. This branch is known as the local gitri branch.

A more detailed branch name is required because there may be branches with the same name from different project remotes, revsets, and remotes.

Current philosophy is that development from different revsets with the same branches, should be separate.

Branches

Checking out a revset for the first time creates the local gitri branch (see above for naming convention). Note that two revsets that point to the same branch will have two local copies of that branch - this is by design. In this way, we implicitly maintain (committed, at least) local state of revsets between across checkouts. Checking out subsequent times leaves the current branch and checks out the local gitri branch. Checkout options are passed straight through to git.

A message should be printed indicating the last time the revset was fetched from the server, and any local changes to the revset.

Adding a repo records that branch name in the manifest.xml file. Note that these changes are not maintained across revset checkouts, i.e. adding, then checking out a revset (even the same one), then checking out the original revset reverts the branch to the local git branch.

Commit creates the proper local gitri branch if the user is on another branch (see naming convention above - users may check out other branches that are suffixes of that naming convention, and the correctly named branch will be created. Existing gitri branches will be overwritten if they are ancestors of the new branch, otherwise an error will be thrown, or overriden with -f). Changes to manifest.xml are committed.

Push pushes all local branches, including the manifest branch (revset) to the appropriate server.

Philosophy

Obviously, given the name, gitri is meant to mimic git in some sense. However, there are fundamental differences between managing "projects" and "repositories." Some loose design guidelines:

Follow git when it makes sense.
Similarly, and important enough to state explicitly, don't follow git when it doesn't make sense. Whether because git itself doesn't make sense, or because the design parameter in question simply doesn't map well to projects, doesn't matter.
Modifying repositores (committing, changing branches) requires (for now) knowledge of the underlying version control software (git). However, a user should be able to clone a project and checkout various revsets, ALWAYS getting the correct thing (I'm referring to the quagmire that is fully-qualified branch names here), without any knowledge of the underlying vcs's.

johnmod3 / gitri