treepkg/treepkg: treepkg/git.py annotate

annotate treepkg/git.py @ 562:e188e780977b

Use local-master as default local branch name if no branch is set in the config If a branch is set use branch name also as local branch name

author	Bjoern Ricks <bricks@intevation.de>
date	Fri, 02 Sep 2011 09:47:42 +0000
parents	1f7746e2288e
children	bf8114a76224

rev	line source
501 fd52f1e231ba Fix typo in a comment Andre Heinecke <aheinecke@intevation.de> parents: 447 diff changeset	1 # Copyright (C) 2010 by Intevation GmbH
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	2 # Authors:
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	3 # Andre Heinecke <aheinecke@intevation.de>
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	4 #
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	5 # This program is free software under the GPL (>=v2)
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	6 # Read the file COPYING coming with the software for details.
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	7
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	8 """Collection of Git utility code"""
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	9
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	10 import os
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	11 import shutil
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	12 import re
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	13 import StringIO
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	14
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	15 import run
560 19a3051caebd import capture_output Bjoern Ricks <bricks@intevation.de> parents: 559 diff changeset	16
19a3051caebd import capture_output Bjoern Ricks <bricks@intevation.de> parents: 559 diff changeset	17 from run import capture_output
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	18 from cmdexpand import cmdexpand
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	19 from util import extract_value_for_key
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	20
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	21
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	22 class GitError(Exception):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	23
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	24 """Base class for Git specific errors raised by TreePKG"""
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	25
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	26 class GitRepository(object):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	27
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	28 """Describes a git repository"""
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	29
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	30 def __init__(self, url, branch=None):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	31 """Initialize the git repository description
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	32 Parameters:
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	33 url -- The url of the repository
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	34
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	35 branch -- The name of the remote Branch to track
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	36 defaults to master
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	37 """
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	38 self.url = url
558 bee73fd5bb82 Set default branch to "master" Bjoern Ricks <bricks@intevation.de> parents: 557 diff changeset	39 if not branch:
562 e188e780977b Use local-master as default local branch name if no branch is set in the config Bjoern Ricks <bricks@intevation.de> parents: 561 diff changeset	40 # as default track master as local-master
e188e780977b Use local-master as default local branch name if no branch is set in the config Bjoern Ricks <bricks@intevation.de> parents: 561 diff changeset	41 self.local_branch = "local-master"
558 bee73fd5bb82 Set default branch to "master" Bjoern Ricks <bricks@intevation.de> parents: 557 diff changeset	42 self.branch = "master"
562 e188e780977b Use local-master as default local branch name if no branch is set in the config Bjoern Ricks <bricks@intevation.de> parents: 561 diff changeset	43 else:
e188e780977b Use local-master as default local branch name if no branch is set in the config Bjoern Ricks <bricks@intevation.de> parents: 561 diff changeset	44 self.local_branch = branch
e188e780977b Use local-master as default local branch name if no branch is set in the config Bjoern Ricks <bricks@intevation.de> parents: 561 diff changeset	45 self.branch = branch
559 3fbf0ea1740a Fix: use self.branch to check if it contains a ":" branch variable could be None Bjoern Ricks <bricks@intevation.de> parents: 558 diff changeset	46 if ":" in self.branch:
3fbf0ea1740a Fix: use self.branch to check if it contains a ":" branch variable could be None Bjoern Ricks <bricks@intevation.de> parents: 558 diff changeset	47 branches = self.branch.split(":")
557 9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	48 self.local_branch = branches[0]
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	49 self.branch = branches[1]
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	50
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	51 def checkout(self, localdir):
550 f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	52 """Clones the repository at url into the localdir"""
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	53 run.call(cmdexpand("git clone -q $url $localdir", **locals()))
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	54 if branch:
557 9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	55 self.checkout_branch(localdir)
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	56
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	57 def checkout_branch(self, localdir):
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	58 run.call(cmdexpand("git checkout -q --track -b $local $branch",
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	59 branch=self.branch, local=self.local_branch), cwd=localdir)
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	60
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	61
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	62 def export(self, localdir, destdir):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	63 """Exports the working copy in localdir to destdir"""
550 f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	64 dest = destdir + os.sep
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	65 run.call(cmdexpand("git checkout-index -a -f --prefix=$dest", dest=dest),
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	66 cwd=localdir)
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	67
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	68 def copy(self, localdir, destdir):
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	69 """Copies the working copy to destdir (including .git dir)"""
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	70 shutils.copytree(localdir, destdir)
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	71
557 9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	72 def update(self, localdir):
550 f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	73 """Runs git pull on the localdir."""
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	74 run.call(cmdexpand("git pull -q"), cwd=localdir)
557 9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	75 output = capture_output(cmdexpand("git branch"), cwd=localdir)
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	76 branches = output.splitlines()
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	77 cur_branch = None
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	78 all_branches = []
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	79 for tbranch in branches:
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	80 tbranch = tbranch.strip()
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	81 if tbranch.startswith("*"):
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	82 cur_branch = tbranch[2:]
561 1f7746e2288e Fix typo Bjoern Ricks <bricks@intevation.de> parents: 560 diff changeset	83 tbranch = cur_branch
557 9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	84 all_branches.append(tbranch)
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	85 if not self.local_branch in all_branches:
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	86 self.checkout_branch(localdir)
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	87 # TODO: check if self.local_branch is curbranch
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	88 # doesn't hurt if a checkout is done on the current branch
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	89 if self.branch:
9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	90 run.call(cmdexpand("git checkout -q $branch", branch=self.local_branch),
550 f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	91 cwd=localdir)
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	92
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	93
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	94 def last_changed_revision(self, localdir):
550 f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	95 """Returns the SHA1 sum of the latest commit in the working copy in localdir"""
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	96 output = run.capture_output(cmdexpand("git rev-parse HEAD"),
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	97 cwd=localdir)
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	98 if output is None:
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	99 raise GitError("Cannot determine last changed revision for %r"
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	100 % git_working_copy)
f841b369aa80 add a copy method for git Bjoern Ricks <bricks@intevation.de> parents: 547 diff changeset	101 return output.strip()
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	102
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	103 def check_working_copy(self, localdir):
447 1d16e4844f98 Cleanup misplaced whitespace Andre Heinecke <aheinecke@intevation.de> parents: 446 diff changeset	104 """FIXME STUB: Not implemented for git"""
1d16e4844f98 Cleanup misplaced whitespace Andre Heinecke <aheinecke@intevation.de> parents: 446 diff changeset	105 return None
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	106
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	107 class GitWorkingCopy(object):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	108
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	109 """Represents a checkout of a git repository"""
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	110
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	111 def __init__(self, repository, localdir, logger=None):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	112 """
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	113 Initialize the working copy.
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	114 Parameters:
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	115 repository -- The GitRepository instance describing the
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	116 repository
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	117 localdir -- The directory for the working copy
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	118 logger -- logging object to use for some info/debug messages
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	119 """
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	120 self.repository = repository
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	121 self.localdir = localdir
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	122 self.logger = logger
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	123
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	124 def log_info(self, *args):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	125 if self.logger is not None:
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	126 self.logger.info(*args)
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	127
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	128 def update_or_checkout(self, revision=0):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	129 """Updates the working copy or creates by checking out the repository.
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	130 Revision number included for compatibility
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	131 """
509 c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	132 gitdir = os.path.join(self.localdir, ".git")
545 991bc01ae668 log used git repo and branch Bjoern Ricks <bricks@intevation.de> parents: 541 diff changeset	133 branch = self.repository.branch
509 c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	134 if os.path.exists(gitdir):
545 991bc01ae668 log used git repo and branch Bjoern Ricks <bricks@intevation.de> parents: 541 diff changeset	135 self.log_info("Updating the working copy in %r for repo " \
991bc01ae668 log used git repo and branch Bjoern Ricks <bricks@intevation.de> parents: 541 diff changeset	136 "%s and branch %s", self.localdir,
546 149d18aca4f7 fix variable name Bjoern Ricks <bricks@intevation.de> parents: 545 diff changeset	137 self.repository.url,
545 991bc01ae668 log used git repo and branch Bjoern Ricks <bricks@intevation.de> parents: 541 diff changeset	138 branch)
557 9824e409388b Refactor git branching Bjoern Ricks <bricks@intevation.de> parents: 552 diff changeset	139 self.repository.update(self.localdir)
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	140 else:
519 0365b2c7ac00 don't checkout master branch by default for local branch. local would point to the local master and not to origin/master. Bjoern Ricks <bricks@intevation.de> parents: 509 diff changeset	141 # TODO: better check if localdir contains files
520 5802cec2b071 fixed typo Bjoern Ricks <bricks@intevation.de> parents: 519 diff changeset	142 if os.path.exists(self.localdir):
519 0365b2c7ac00 don't checkout master branch by default for local branch. local would point to the local master and not to origin/master. Bjoern Ricks <bricks@intevation.de> parents: 509 diff changeset	143 raise GitError("Working copy dir %s already exists. " \
0365b2c7ac00 don't checkout master branch by default for local branch. local would point to the local master and not to origin/master. Bjoern Ricks <bricks@intevation.de> parents: 509 diff changeset	144 " files. Can't checkout from %s" % (self.localdir,
0365b2c7ac00 don't checkout master branch by default for local branch. local would point to the local master and not to origin/master. Bjoern Ricks <bricks@intevation.de> parents: 509 diff changeset	145 self.repository.url))
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	146 self.log_info("The working copy in %r doesn't exist yet."
545 991bc01ae668 log used git repo and branch Bjoern Ricks <bricks@intevation.de> parents: 541 diff changeset	147 " Checking out branch %s from %r",
991bc01ae668 log used git repo and branch Bjoern Ricks <bricks@intevation.de> parents: 541 diff changeset	148 self.localdir, branch, self.repository.url)
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	149 self.repository.checkout(self.localdir)
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	150
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	151 def export(self, destdir):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	152 """Exports the working copy to destdir"""
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	153 self.repository.export(self.localdir, destdir)
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	154
527 8138df69a32e implement export_tag for git working copy Bjoern Ricks <bricks@intevation.de> parents: 526 diff changeset	155 def export_tag(self, url, destdir, revision=None):
8138df69a32e implement export_tag for git working copy Bjoern Ricks <bricks@intevation.de> parents: 526 diff changeset	156 """Export tag to destir """
8138df69a32e implement export_tag for git working copy Bjoern Ricks <bricks@intevation.de> parents: 526 diff changeset	157 self.export(destdir)
8138df69a32e implement export_tag for git working copy Bjoern Ricks <bricks@intevation.de> parents: 526 diff changeset	158
321 092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	159 def last_changed_revision(self):
092925ff75d7 Added basic Git support, configuration options: Andre Heinecke <aheinecke@intevation.de> parents: diff changeset	160 """Returns the last changed rev of the working copy"""
541 8b49548aa8d4 provide stubs for short_revision number Bjoern Ricks <bricks@intevation.de> parents: 531 diff changeset	161 return self.get_revision()
508 29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	162
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	163 def list_tags(self, pattern):
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	164 output = run.capture_output(cmdexpand("git tag -l $pattern",
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	165 pattern=pattern), cwd=self.localdir)
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	166 return output.splitlines()
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	167
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	168 def get_revision(self, refname="HEAD"):
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	169 """Return the SHA1 sum of the latest commit"""
509 c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	170 output = run.capture_output(cmdexpand("git rev-parse $refname",
c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	171 refname=refname), cwd=self.localdir)
508 29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	172 if output is None:
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	173 raise GitError("Cannot determine revision for %r"
509 c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	174 % self.localdir)
508 29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	175 return output.strip()
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	176
541 8b49548aa8d4 provide stubs for short_revision number Bjoern Ricks <bricks@intevation.de> parents: 531 diff changeset	177 def get_short_revision(self, refname="HEAD"):
8b49548aa8d4 provide stubs for short_revision number Bjoern Ricks <bricks@intevation.de> parents: 531 diff changeset	178 """Return the short SHA1 sum of the latest commit"""
8b49548aa8d4 provide stubs for short_revision number Bjoern Ricks <bricks@intevation.de> parents: 531 diff changeset	179 revision = self.get_revision(refname)
8b49548aa8d4 provide stubs for short_revision number Bjoern Ricks <bricks@intevation.de> parents: 531 diff changeset	180 return revision[:7]
8b49548aa8d4 provide stubs for short_revision number Bjoern Ricks <bricks@intevation.de> parents: 531 diff changeset	181
508 29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	182 class TagDetector:
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	183
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	184 """Class to detect tags from a git repository
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	185
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	186 The tags are found using the parameters:
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	187 url -- The url of the git repository to use
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	188 pattern -- A regular expression matching the tags
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	189 """
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	190
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	191 def __init__(self, url, pattern, localdir):
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	192 self.url = url
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	193 self.pattern = pattern
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	194 repo = GitRepository(url)
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	195 self.workingcopy = GitWorkingCopy(repo, localdir)
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	196
509 c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	197 def list_tags(self):
508 29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	198 self.workingcopy.update_or_checkout()
509 c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	199 tags = self.workingcopy.list_tags(self.pattern)
c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	200 return sorted(tags)
c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	201
c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	202 def newest_tag_revision(self):
c4288095887f update git tag detector and add test Bjoern Ricks <bricks@intevation.de> parents: 508 diff changeset	203 candidates = self.list_tags()
508 29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	204 urlrev = (None, None)
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	205 if candidates:
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	206 newest = candidates[-1]
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	207 try:
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	208 rev = self.workingcopy.get_revision(newest)
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	209 urlrev = (newest, rev)
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	210 except GitError:
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	211 pass
29f6d1f5cc53 add a tag detector for git Bjoern Ricks <bricks@intevation.de> parents: 501 diff changeset	212 return urlrev
525 e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	213
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	214 def tag_pkg_parameters(self, tag_name):
526 4a56ebc53ada tag_pkg_parameters is also used in enterprise tags recipe Bjoern Ricks <bricks@intevation.de> parents: 525 diff changeset	215 # FIXME: Don't hardcore regex
525 e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	216 #match = re.search(r"enterprise[^.]\.[^.]\."
531 b5e0c81c9bcc update regex for tag name schema Bjoern Ricks <bricks@intevation.de> parents: 527 diff changeset	217 match = re.search(r"enterprise[^.]\.[^.]"
525 e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	218 r"(?P<date>[0-9]{8})",
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	219 tag_name)
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	220 if match:
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	221 date = match.group("date")
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	222 return (date, 1)
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	223 else:
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	224 raise GitError("Cannot determine tag parameters from %s"
e73a4bbc35e7 tag_pkg_parameters depends on scm therefore move this method to the Bjoern Ricks <bricks@intevation.de> parents: 520 diff changeset	225 % tag_name)

Mercurial > treepkg > treepkg

annotate treepkg/git.py @ 562:e188e780977b