[Dune-devel] [Dune] DUNE migration to Git complete

Steffen Müthing steffen.muething at ipvs.uni-stuttgart.de
Mon May 6 14:50:06 CEST 2013 

Dear Dune developers,

just a quick follow-up to the mail I sent to the main list with some points that aren't as relevant
to our users:

- As I already wrote in the reply to Martin this morning, I think it would be a good idea if everyone
  with access to a xyz at dune-project.org address used that address as the committer id for the
  Dune repositories, just to have continuity between the old, converted commits and anything that
  gets added from now on. And thanks to Christian bugging me about it, there is a really easy way
  to set this up, described at http://users.dune-project.org/projects/main-wiki/wiki/Dunecontrol_vcsetup.

- Carsten brought up the idea of requiring editor hints in new (C++) files. Adding that to the hooks would
  take about five minutes, but what is the general opinion regarding this feature?

- In order to mirror our repositories on GitHub, I set up an organizational account called dune-project.
  Currently I am the sole owner of the organization, but I'll gladly add other developers. Just let me know
  and tell me your GitHub account name. I'll also add you to the alias for the associated email account
  (github at dune-project.org).

- There is also a GitHub user called duneprojectmirrorjob that is responsible for the actual mirroring. It
  also has an email alias (duneprojectmirrorjob at dune-project.org). If anyone needs the password, just
  ask. I use an OAuth token for this user to do the actual pushes. The pushes happen with "--mirror -f",
  so any changes that get committed directly to GitHub (bypassing git.dune-project.org) are discarded
  during the next mirroring update.

- I've disabled the repository wikis on GitHub, but there is no way to switch off the bug trackers and
  pull requests. That said, do we want to encourage people to use the pull request feature of GitHub when
  submitting patches? I don't know: We lose the central gateway that FlySpray has become to a certain
  extent, but the functionality is awfully convenient, making it incredibly easy to review the patches, update
  the patch queue with further fixes and supporting comments on the whole request, individual commits or
  even diff lines… And lots of people are used to working with GitHub right now. Any comments or ideas?

- I wanted to add a nice logo to the GitHub page, but that works via Gravatar, which in turn requires a
  WordPress login. The login name "duneproject" is already taken, though. Does one of the developers
  control that login?

- We should really encourage users to send us patches via pull request (preferred) or, if that is not possible
  for some reason, via "git format-patch". Apart from saving the person applying the patch a lot of work, this
  also has the additional advantage of preserving the committer (for pull requests) or at least author (for
  "git format-patch") information. With that information in the repository it should become a lot easier to compile
  stuff like lists of external contributors in the future.

Sorry for the long mail, it's just what came up over the weekend…

Greetings,

Steffen



Am 06.05.2013 um 11:36 schrieb Steffen Müthing:

> Dear Dune users and developers,
> 
> the migration from SVN to Git is now complete! :-)
> 
> 
> === Getting and browsing the code ===
> 
> Information on how to obtain the Git repositories can be found on [1]. There is a new repository
> browser at [2], which is also tied into the commit emails.
> 
> 
> === SVN repositories ===
> 
> We will keep the SVN repositories available for the time being, both as an archive and to avoid
> breaking any scripts that rely on their existence, but remember that they are frozen and do not
> receive updates anymore.
> 
> 
> === Repository layout ===
> 
> There is a little bit of structure to the branch layout, see [3] for details. Moreover, the Wiki contains
> the start of a collection of important information (like the whitespace policy) and useful tips (like
> how to set up a credential cache), which can be found at [4].
> 
> 
> === Commit messages ===
> 
> As anyone who is subscribed to the commit mailing list will have noticed, the format of the commit mails
> has changed significantly. The most important change is that there are now two types of mails:
> 
> - branch update mails contain a short overview of all the commits that got added to a branch as part
>  of a push operation. One such mail is generated for every branch update, even if you update several
>  branches with a single push. The server does not generate mails for updates to the developer's personal
>  branches (see [3] for an explanation of what those are).
> 
> - commit mails are similar to the old emails generated for the SVN repositories: they contain the commit
>  message and a diff of the changes. In addition, they start with a list of all the branches the commit got
>  added to *at the time the mail was generated*. See below for an explanation of why that restriction
>  matters. Commit messages are generated the first time a commit is mentioned in a branch update mail,
>  so commits that only get pushed to a personal branch will not trigger a commit mail. The commit mail will
>  be generated as soon as the commit gets merged into master or a feature branch, however.
> 
> There is a third type of mail generated for tags, but as tagging is a rare operation, those probably
> aren't all that important.
> 
> All that information can be a little inconvenient to navigate in plain-text emails, so the messages contain
> links to the repository browser to show you the equivalent logs / commits in a format that's much easier
> to navigate and poke around in.
> 
> In order to simplify filtering, all messages have a tag of either [Commit] or [branch] so that you can keep
> the actual commit messages separate from the branch updates. For even more filtering, take a look at
> the mail headers, there is quite a number of X-Git-* headers for that purpose.
> 
> 
> === Whitespace cleanup ===
> 
> As part of the migration, we have taken the opportunity to remove trailing whitespace and reindent
> all source files in the repositories. Don't be alarmed if a lot of files differ between the Git and Subversion
> repositories, the changes are only in the whitespace (and in the editor indentation hints that have been
> added in a uniform fashion), but if you want to contribute patches to Dune, please take a look at [5] for the
> implications.
> 
> 
> === GitHub mirror ===
> 
> The Dune repositories are also mirrored on GitHub at https://github.com/dune-project, but please keep using
> our infrastructure (wiki, bug tracker etc.).
> 
> 
> === git-svn ===
> 
> A lot of people have been using the git-svn bridge to interface with the SVN repositories.
> If you are one of them, please be aware that the Git commits synthesized by git-svn are
> not compatible with the new Git repositories. The cleanest way to migrate git-svn checkouts
> is to just delete the git-svn repository and clone the new Git repository. We have also created
> a [guide][6] to transferring any local patches you might have in git-svn to the new Git repository.
> 
> 
> ======
> 
> Happy committing, branching, rebasing, merging, bisecting and whatever other crazy things you
> might want to do in Git!
> 
> 
> Steffen and the rest of the DUNE team
> 
> 
> 
> [1] http://www.dune-project.org/downloadgit.html
> 
> [2] http://cgit.dune-project.org/repositories
> 
> [3]: http://users.dune-project.org/projects/main-wiki/wiki/Repository_layout
> 
> [4]: http://users.dune-project.org/projects/main-wiki/wiki/Guides_dune_core_modules
> 
> [5]: http://users.dune-project.org/projects/main-wiki/wiki/Whitespace_hook
> 
> [6]: http://users.dune-project.org/projects/main-wiki/wiki/Migrating_git-svn_patches
> 
> 
> Steffen Müthing
> Universität Stuttgart
> Institut für Parallele und Verteilte Systeme
> Universitätsstr. 38
> 70569 Stuttgart
> Tel: +49 711 685 88429
> Fax: +49 711 685 88340
> Email: steffen.muething at ipvs.uni-stuttgart.de
> 
> _______________________________________________
> Dune mailing list
> Dune at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune

Steffen Müthing
Universität Stuttgart
Institut für Parallele und Verteilte Systeme
Universitätsstr. 38
70569 Stuttgart
Tel: +49 711 685 88429
Fax: +49 711 685 88340
Email: steffen.muething at ipvs.uni-stuttgart.de

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20130506/bf84d0e4/attachment.sig>

More information about the Dune-devel mailing list