rake/hg.rb in configurability-1.0.2 vs rake/hg.rb in configurability-1.0.3

- old
+ new

@@ -149,25 +149,26 @@ desc "Prepare for a new release" task :prep_release do tags = get_tags() rev = get_current_rev() + pkg_version_tag = "v#{PKG_VERSION}" # Look for a tag for the current release version, and if it exists abort - if tags.include?( PKG_VERSION ) + if tags.include?( pkg_version_tag ) error "Version #{PKG_VERSION} already has a tag. Did you mean " + "to increment the version in #{VERSION_FILE}?" fail end # Sign the current rev log "Signing rev #{rev}" run 'hg', 'sign' # Tag the current rev - log "Tagging rev #{rev} as #{PKG_VERSION}" - run 'hg', 'tag', PKG_VERSION + log "Tagging rev #{rev} as #{pkg_version_tag}" + run 'hg', 'tag', pkg_version_tag # Offer to push Rake::Task['hg:push'].invoke end @@ -224,9 +225,21 @@ desc "Pull and update without confirmation" task :pull_without_confirmation do run 'hg', 'pull', '-u' + end + + + desc "Update to tip" + task :update do + run 'hg', 'update' + end + + + desc "Clobber all changes (hg up -C)" + task :update_and_clobber do + run 'hg', 'update', '-C' end desc "Check the current code in if tests pass" task :checkin => ['hg:pull', 'hg:newfiles', 'test', COMMIT_MSG_FILE] do