Migrated away from Bazaar to Git! Reflect the changes in the scripts, cheatsheets

cheatsheets/index.txt

@@ -1,7 +1,7 @@
 Infrastructure
 ==============
 
-Bazaar tree		     - infrastructure/bazaar.txt
+Git tree		     - infrastructure/git.txt
 Request Tracker		     - infrastructure/rt.txt
 kaufmann.debian.org layout   - infrastructure/kaufmann.txt
 HKP keyserver	    	     - infrastructure/hkp.txt

cheatsheets/infrastructure/bazaar.txt

@@ -1,35 +0,0 @@
-Bazaar working tree
--------------------
-
-Keyring work is coordinated in the Bazaar tree living in
-/org/keyring.debian.org/master-keyring/ at keyring.debian.org (which
-is an alias to kaufmann.debian.org). You need to have an account on
-kaufmann to get access to the working tree -  After some Bazaar breakage, I
-have found the stable, working URL for this branch to be:
-
-nosmart+sftp://kaufmann.debian.org/org/keyring.debian.org/master-keyring/
-
-You should _always_ work in "bound mode" (i.e. using Bazaar as a
-centralized VCS), unless you have a good reason not to. Just:
-
-$ bzr checkout nosmart+sftp://kaufmann.debian.org/org/keyring.debian.org/master-keyring/
-$ cd master-keyring
-$ bzr bind
-
-There is a public copy of the tree we push to whenever we push the
-updates; it is available at Debian's bzr server:
-
-bzr+ssh://bzr.debian.org/bzr/keyring/debian-keyring
-
-So, when you push a new revision, do:
-
-$ bzr push --create-prefix bzr+ssh://bzr.debian.org/bzr/keyring/debian-keyring
-
-Configure Bazaar to always sign commit messages - Add the following to
-your ~/.bazaar/bazaar.conf (of course, with your data instead of
-mine):
-
-[DEFAULT]
-email = Gunnar Wolf <gwolf@debian.org>
-create_signatures = always
-check_signatures = always

cheatsheets/infrastructure/git.txt

@@ -0,0 +1,39 @@
+Git working tree
+----------------
+
+Keyring work is coordinated in the Git tree living in
+/org/keyring.debian.org/master-keyring.git/ at keyring.debian.org
+(which is an alias to kaufmann.debian.org). You need to have an
+account on kaufmann to get access to the working tree. The URL for the
+Git repository is:
+
+ssh://kaufmann.debian.org/org/keyring.debian.org/master-keyring.git/
+
+Note that, before March 2014, we used to work on a Bazaar tree. When
+the tree was imported over to Git, the only bit of lost information
+were the commit signatures. The Bazaar tree up to that point (left at
+commit #1297) is still available in Kaufmann, at
+/org/keyring.debian.org/master-keyring/ (probably we should replace it
+to avoid confusions!).
+
+
+** Note: The following must be updated as well to use a public Git tree!
+> 
+> There is a public copy of the tree we push to whenever we push the
+> updates; it is available at Debian's bzr server:
+> 
+> bzr+ssh://bzr.debian.org/bzr/keyring/debian-keyring
+> 
+> So, when you push a new revision, do:
+> 
+> $ bzr push --create-prefix bzr+ssh://bzr.debian.org/bzr/keyring/debian-keyring
+
+All commits should be GPG-signed. To do so, specify your signing key
+to Git, like:
+
+$ git config user.signingkey 0x0000DEAD0000BEEF
+
+And remember to always specify the '-S' switch when committing!
+
+** Note: A nice Git hook can be of use here to remind us if we're
+   missing -S

scripts/add-key

@@ -64,7 +64,7 @@ read n
 if [ "x$n" = "xy" -o "x$n" = "xY" ]; then
 	gpg --no-auto-check-trustdb --options /dev/null \
 		--export $keyid > $keydir/0x$keyid
-	bzr add $keydir/0x$keyid
+	git add $keydir/0x$keyid
 	if ( echo $2 | egrep  -q '^(\./)?debian-(keyring|nonupload)-gpg/?$' ); then
 		echo -n "Enter full name of new key: "
 		read name

scripts/move-key

@@ -83,7 +83,7 @@ if [ "x$n" = "xy" -o "x$n" = "xY" ]; then
 	log="Move $key ($name) to removed keyring $rtid"
     fi
 
-    bzr mv $keyfile $destdir
+    git mv $keyfile $destdir
     dch -D UNRELEASED -a "$log"
 
     if [ ! -z "$add_to_keyid" ]; then

scripts/replace-key

@@ -78,7 +78,7 @@ if [ "x$n" = "xy" -o "x$n" = "xY" ]; then
 
     log="Replace $oldkey with $newkey ($name) (RT #$rtid)"
 
-    bzr mv $oldkeyfile removed-keys-gpg/
+    git mv $oldkeyfile removed-keys-gpg/
     dch -D UNRELEASED -a "$log"
 
 fi