diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-07-26 11:26:15 +0200 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-07-26 11:26:15 +0200 |
commit | 7a90533a806fd76e89795fff427473e7264662f7 (patch) | |
tree | 7bcf5c2f4455887a9786bdb60708126ef936329b /src/nbblib/vcs.py | |
parent | 37ee99e8e72e2b8c50bec80f9b2bacc8dde04df7 (diff) | |
download | nbb-releases.tar.gz nbb-releases.tar.xz nbb-releases.zip |
nbb 0.2releases
* Switch to release tags including the package name
* Make automake's "nbb make" depend on configure etc.
Squashed commit of the following:
commit 9c4a035b71c7648b006b91a52e86edb2baea5138
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Sat Jul 26 10:36:31 2008 +0200
New version tag syntax: "make tag VER=1.2"
commit fefebc702664a683ceeafa800b0fe75178d63037
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Sat Jul 26 10:30:02 2008 +0200
Switch to release tags including the package name
This will reduce tag confusion when we fork into a
different project.
A tag like nbb-1.2 or foo-tools-1.2 is much more useful
than v1.2.
commit 330c382390ffbe3c361a763d5cee6febe1b30f5e
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Tue Jul 22 12:08:41 2008 +0200
Remove obsolete .htaccess file
commit b1d5fc06e235a45561bf53b4bfd07856cec4ea81
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Thu Jul 24 15:03:14 2008 +0200
Make automake's "make" command depend on configure
commit 958e81655ad143dfd54b099637db60db42f77fb0
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Thu Jul 24 15:00:33 2008 +0200
Adjust testcases for absolute builddirs
When configure is called as /path/to/configure instead of
../path/to/configure, the ".git/" test directories are reported
by "git init" using absolute pathnames, not must ".git/".
commit 72dac191283299c66356dc895eb6ba19982b16ab
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Thu Jul 24 14:59:19 2008 +0200
Fix typo in automake/distcheck test case
commit 7ca2e00188d8668b6b1f4116559ddae4e3cbb35c
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Thu Jul 24 13:32:49 2008 +0200
Open 0.1.x section in NEWS
commit e05a138e9e3099455fa23799550949512188b3c9
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Tue Jul 22 08:40:31 2008 +0200
Add license review to TODO
commit e2fd1f2e101486859899049147df7993c8042df7
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Sat Jul 19 00:25:12 2008 +0200
Ensure cmp/mv/rm rules are correct and silent
Make sure the "if cmp ... mv .. rm" in make rules are
correct and useful, and the cmp is silent.
commit b6e7a354ed1ab53aebdb775a800156629744a065
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Wed Jul 16 21:03:36 2008 +0200
Reflect code progress in TODO file, add plans
commit 9559ceb5def8ec5d2e5674e7bf25b484877b3e60
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Wed Jul 16 06:12:30 2008 +0200
Fix some issues found by pylint/pychecker
Includes real issues like wrong argument numbers and missing
ancestor __init__() calls, whitespace and comment cleanups.
Cannot "fix" everything because of a good amount of the warnings
raised by pylint/pychecker are false alarms.
commit c73487455e8d9a283fcb328eab8573c4c5bc73c7
Author: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Wed Jul 16 06:11:57 2008 +0200
Add pylint and pychecker checks as "lint" target
Diffstat (limited to 'src/nbblib/vcs.py')
-rw-r--r-- | src/nbblib/vcs.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/nbblib/vcs.py b/src/nbblib/vcs.py index a78663f..336f9c9 100644 --- a/src/nbblib/vcs.py +++ b/src/nbblib/vcs.py @@ -1,3 +1,8 @@ +"""\ +VCS Source Tree plugin system +""" + + import os import logging import urlparse @@ -32,10 +37,6 @@ class AbstractConfig(object): installdir = property(get_installdir) -######################################################################## -# VCS Source Tree plugin system -######################################################################## - class NotAVCSourceTree(plugins.PluginNoMatch): def __init__(self, srcdir): super(NotAVCSourceTree, self).__init__() @@ -151,7 +152,7 @@ class GitSourceTree(VCSourceTree): def _get_branch_name(self): bname = progutils.prog_stdout(["git", "symbolic-ref", "HEAD"]) - refs,heads,branch = bname.split('/') + refs, heads, branch = bname.split('/') assert(refs=='refs' and heads=='heads') return branch @@ -162,14 +163,16 @@ class GitConfig(AbstractConfig): def __init__(self, *args, **kwargs): super(GitConfig, self).__init__(*args, **kwargs) - def _itemname(self, item): return '.'.join((package.GIT_CONFIG_PREFIX, item, )) + def _itemname(self, item): + return '.'.join((package.GIT_CONFIG_PREFIX, item, )) + def _myreldir(self, rdir): return os.path.join(self._srcdir, rdir, self._nick) def get_builddir(self): ret, stdout, stderr = progutils.prog_retstd(['git', 'config', self._itemname('builddir')]) assert(stderr == "") - if ret == 0 and stdout: + if ret == 0 and stdout: return self._myreldir(stdout) else: return super(GitConfig, self).get_builddir() @@ -183,7 +186,7 @@ class GitConfig(AbstractConfig): def get_installdir(self): ret, stdout, stderr = progutils.prog_retstd(['git', 'config', self._itemname('installdir')]) assert(stderr == "") - if ret == 0 and stdout: + if ret == 0 and stdout: return self._myreldir(stdout) else: return super(GitConfig, self).get_installdir() @@ -205,7 +208,7 @@ class BzrSourceTree(VCSourceTree): import bzrlib.errors import bzrlib.workingtree try: - wt,b = bzrlib.workingtree.WorkingTree.open_containing(srcdir) + wt, b = bzrlib.workingtree.WorkingTree.open_containing(srcdir) except bzrlib.errors.NotBranchError: logging.debug("Not a bzr branch: %s", repr(srcdir)) raise self.no_match_exception(srcdir) @@ -223,7 +226,7 @@ class BzrSourceTree(VCSourceTree): #print "wt.branch.basis_tree:", wt.branch.basis_tree() def _get_tree_root(self): - proto,host,path,some,thing = urlparse.urlsplit(self.wt.branch.base) + proto, host, path, some, thing = urlparse.urlsplit(self.wt.branch.base) assert(proto == "file" and host == "") assert(some == "" and thing == "") return os.path.abspath(path) |