projects
/
mass-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forward installFiles option; debian folder is no longer persistent
[mass-build.git]
/
vcs.py
diff --git
a/vcs.py
b/vcs.py
index 893a75f159832a4e84dd49ee394a0acdbab7ebd1..f7a99c10d006557918a17e4f6497e463cb5a0d10 100644
(file)
--- a/
vcs.py
+++ b/
vcs.py
@@
-36,13
+36,13
@@
class Git:
branch = repo.heads[branchname]
else:
branch = repo.create_head(branchname, self.commit)
branch = repo.heads[branchname]
else:
branch = repo.create_head(branchname, self.commit)
- if isBranch:
+ if isBranch:
# track remote branch
branch.set_tracking_branch(origin.refs[branchname])
# update it to the latest remote commit
branch.checkout()
repo.git.rebase(self.commit)
print "...done",
branch.set_tracking_branch(origin.refs[branchname])
# update it to the latest remote commit
branch.checkout()
repo.git.rebase(self.commit)
print "...done",
- if repo.head.reference.commit != repo.
refs[self.commit].commit
:
+ if repo.head.reference.commit != repo.
commit(self.commit)
:
print "(keeping local patches around)",
print
print "(keeping local patches around)",
print
@@
-58,10
+58,11
@@
class KDEGit(Git):
# Fetch updates via SVN
class SVN:
# Fetch updates via SVN
class SVN:
- def __init__(self, folder, svnPath):
+ def __init__(self, folder, svnPath
, versionName
):
self.folder = os.path.abspath(folder)
self.svnPath = svnPath
self.folder = os.path.abspath(folder)
self.svnPath = svnPath
-
+ self.versionName = versionName
+
def update(self):
if os.path.exists(self.folder):
os.chdir(self.folder) # go into repository
def update(self):
if os.path.exists(self.folder):
os.chdir(self.folder) # go into repository
@@
-69,6
+70,9
@@
class SVN:
else:
subprocess.check_call(['svn', 'co', self.svnPath, self.folder])# just download it
else:
subprocess.check_call(['svn', 'co', self.svnPath, self.folder])# just download it
+ def version(self):
+ return self.versionName
+
class KDESVN(SVN):
class KDESVN(SVN):
- def __init__(self, folder, svnPath):
- SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath)
+ def __init__(self, folder, svnPath
, version
):
+ SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath
, version
)