Mercurial > gub

changeset 5590:70bea8610293 lilypond-release-branch

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'mester'
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 28 Sep 2009 20:33:58 +0200
parents 781d469231f5 (diff) c5ff07d9622b (current diff)
children 20bdf18aff7e
files
diffstat 4 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/gub/repository.py	Tue Sep 22 11:09:24 2009 +0200
+++ b/gub/repository.py	Mon Sep 28 20:33:58 2009 +0200
@@ -658,17 +658,16 @@
     def _update_workdir_shallow (self, destdir):
         branch = self.branch # branch is empty?
         branch = 'master'
+        HEAD = self.checksum ()
         if not os.path.isdir (os.path.join (destdir, self.vc_system)):
             self.system ('mkdir -p %(destdir)s' % locals ())
             self.system ('cd %(destdir)s && git init' % locals ())
-        open ('%(destdir)s/.git/objects/info/alternates' % locals (), 'w').write (os.path.join (self.dir, 'objects'))
-        if 0: # no-go
-            open ('%(destdir)s/.git/HEAD' % locals (), 'w').write (self.checksum ())
-            HEAD = 'HEAD'
-        HEAD = self.checksum ()
-        self.system ('cd %(destdir)s && git reset --hard %(HEAD)s' % locals ())
-        self.system ('cd %(destdir)s && (git checkout -f %(branch)s || git branch %(branch)s)' % locals ())
-        self.system ('cd %(destdir)s && git reset --hard %(HEAD)s' % locals ())
+            open ('%(destdir)s/.git/objects/info/alternates' % locals (), 'w').write (os.path.join (self.dir, 'objects'))
+#            self.system ('cd %(destdir)s && git reset --hard %(HEAD)s' % locals ())
+        if self.git_pipe ('diff' % locals (), dir=destdir):
+            self.system ('cd %(destdir)s && git reset --hard %(HEAD)s' % locals ())
+        self.system ('cd %(destdir)s && git checkout %(HEAD)s' % locals ())
+        self.system ('cd %(destdir)s && (git checkout %(branch)s || git checkout -b %(branch)s)' % locals ())
     def _update_workdir (self, destdir):
         checkout_dir = self.dir
         branch = self.get_ref ()
--- a/gub/versiondb.py	Tue Sep 22 11:09:24 2009 +0200
+++ b/gub/versiondb.py	Mon Sep 28 20:33:58 2009 +0200
@@ -73,7 +73,7 @@
                        'v1.4', 'v1.5', 'v1.6', 'v1.7', 'v1.8', 'v1.9',
                        'v2.0', 'v2.1', 'v2.2', 'v2.3', 'v2.4', 'v2.5',
                        'v2.6', 'v2.7', 'v2.8', 'v2.9', 'v2.10', 'v2.11',
-                       'v2.12',]
+                       'v2.12','v2.13',]
 
         sources = []
         for d in directories:
--- a/test-lily/rsync-lily-doc.py	Tue Sep 22 11:09:24 2009 +0200
+++ b/test-lily/rsync-lily-doc.py	Mon Sep 28 20:33:58 2009 +0200
@@ -115,13 +115,12 @@
     
     printf ('Instrumenting for Google Analytics' )
     for f in ['Documentation/index.html',
-              'Documentation/topdocs/NEWS.html',
-              'Documentation/user/lilypond/index.html',
-              'Documentation/user/lilypond-internals/index.html',
+              'Documentation/changes.html',
+              'Documentation/notation/index.html',
+              'Documentation/internals/index.html',
               'examples.html',
-              'Documentation/user/music-glossary/index.html',
-              'Documentation/topdocs/NEWS.html',
-              'Documentation/user/lilypond-learning/Tutorial.html',
+              'Documentation/music-glossary/index.html',
+              'Documentation/learning/index.html',
 #	      'input/test/collated-files.html',
               'input/regression/collated-files.html']:
         do_urchin (f)
--- a/test-lily/upload.py	Tue Sep 22 11:09:24 2009 +0200
+++ b/test-lily/upload.py	Mon Sep 28 20:33:58 2009 +0200
@@ -178,11 +178,13 @@
     ## don't do cygwin .
     ##    cmds.append ('rsync -v --recursive --delay-updates --progress uploads/cygwin/release/ %(host_binaries_spec)s/cygwin/release/' % globals ())
     
-    description = repo.git_pipe ('describe --abbrev=39 %s' % repo.get_ref ()).strip ()
+    description = repo.git_pipe ('describe --always --abbrev=39 %s' % repo.get_ref ()).strip ()
     
     git_tag = 'release/%(version_str)s-%(build)d' % locals () 
-    git_tag_cmd = 'git --git-dir downloads/lilypond tag -m "" -a %(git_tag)s %(dirred_branch)s' % locals ()
-    git_push_cmd = 'git --git-dir downloads/lilypond push ssh+git://'+maintainer_git_username+'@git.sv.gnu.org/srv/git/lilypond.git/ refs/tags/%(git_tag)s:refs/tags/%(git_tag)s' % locals ()
+    git_dir = repo.dir
+    git_tag_cmd = 'git --git-dir %(git_dir)s tag -m "" -a %(git_tag)s %(dirred_branch)s' % locals ()
+    my_maintainer_git_username = maintainer_git_username
+    git_push_cmd = 'git --git-dir %(git_dir)s push ssh+git://%(my_maintainer_git_username)s@git.sv.gnu.org/srv/git/lilypond.git/ refs/tags/%(git_tag)s:refs/tags/%(git_tag)s' % locals ()
     gub_tag_cmd = 'git tag -m "release of lilypond %(description)s (%(version_str)s-%(build)d)"  "gub-release-lilypond-%(version_str)s-%(build)d"' % locals ()
 
     cmds.append (git_tag_cmd)