Mercurial > treepkg > treepkg
annotate treepkg/subversion.py @ 303:df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
The URL used to originally check out the working must still match the
one given in the configuration file. If it doesn't match, a
SubversionUrlMismatchError is raised.
author | Bernhard Herzog <bh@intevation.de> |
---|---|
date | Thu, 26 Nov 2009 15:37:48 +0000 |
parents | 020421cd3ee2 |
children | 6cffb43a28ca |
rev | line source |
---|---|
224
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
1 # Copyright (C) 2007, 2008, 2009 by Intevation GmbH |
0 | 2 # Authors: |
3 # Bernhard Herzog <bh@intevation.de> | |
4 # | |
5 # This program is free software under the GPL (>=v2) | |
6 # Read the file COPYING coming with the software for details. | |
7 | |
224
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
8 """Collection of subversion utility code""" |
0 | 9 |
10 import os | |
230
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
11 import shutil |
273
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
12 import re |
282
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
13 import StringIO |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
14 |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
15 from lxml import etree |
0 | 16 |
17 import run | |
45
3e610233ccfe
use cmdexpand when calling subprocesses
Bernhard Herzog <bh@intevation.de>
parents:
0
diff
changeset
|
18 from cmdexpand import cmdexpand |
0 | 19 from util import extract_value_for_key |
20 | |
21 | |
269
97fd2584df5f
Make treepkg.subversion.last_changed_revision raise SubversionError if
Bernhard Herzog <bh@intevation.de>
parents:
266
diff
changeset
|
22 class SubversionError(Exception): |
302
020421cd3ee2
Add doc-string to SubversionError
Bernhard Herzog <bh@intevation.de>
parents:
282
diff
changeset
|
23 |
020421cd3ee2
Add doc-string to SubversionError
Bernhard Herzog <bh@intevation.de>
parents:
282
diff
changeset
|
24 """Base class for subversion specific errors raised by TreePKG""" |
020421cd3ee2
Add doc-string to SubversionError
Bernhard Herzog <bh@intevation.de>
parents:
282
diff
changeset
|
25 |
020421cd3ee2
Add doc-string to SubversionError
Bernhard Herzog <bh@intevation.de>
parents:
282
diff
changeset
|
26 |
303
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
27 class SubversionUrlMismatchError(SubversionError): |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
28 |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
29 """The repository URL does not match the URL of a working copy""" |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
30 |
269
97fd2584df5f
Make treepkg.subversion.last_changed_revision raise SubversionError if
Bernhard Herzog <bh@intevation.de>
parents:
266
diff
changeset
|
31 |
262
81ba86662cbd
Add treepkg/subversion.list_url function, a wrapper for "svn list"
Bernhard Herzog <bh@intevation.de>
parents:
230
diff
changeset
|
32 def list_url(url): |
81ba86662cbd
Add treepkg/subversion.list_url function, a wrapper for "svn list"
Bernhard Herzog <bh@intevation.de>
parents:
230
diff
changeset
|
33 """Runs svn list with the given url and returns files listed as a list""" |
81ba86662cbd
Add treepkg/subversion.list_url function, a wrapper for "svn list"
Bernhard Herzog <bh@intevation.de>
parents:
230
diff
changeset
|
34 output = run.capture_output(cmdexpand("svn list $url", **locals())) |
81ba86662cbd
Add treepkg/subversion.list_url function, a wrapper for "svn list"
Bernhard Herzog <bh@intevation.de>
parents:
230
diff
changeset
|
35 return output.splitlines() |
81ba86662cbd
Add treepkg/subversion.list_url function, a wrapper for "svn list"
Bernhard Herzog <bh@intevation.de>
parents:
230
diff
changeset
|
36 |
208
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
37 def checkout(url, localdir, revision=None, recurse=True): |
0 | 38 """Runs svn to checkout the repository at url into the localdir""" |
208
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
39 args = [] |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
40 if revision: |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
41 args.extend(["--revision", revision]) |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
42 if not recurse: |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
43 args.append("-N") |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
44 run.call(cmdexpand("svn checkout -q @args $url $localdir", **locals())) |
0 | 45 |
208
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
46 def update(localdir, revision=None, recurse=True): |
79
570ac81865be
Add revision parameter to update so that a checkout can be updated to a
Bernhard Herzog <bh@intevation.de>
parents:
45
diff
changeset
|
47 """Runs svn update on the localdir. |
570ac81865be
Add revision parameter to update so that a checkout can be updated to a
Bernhard Herzog <bh@intevation.de>
parents:
45
diff
changeset
|
48 The parameter revision, if given, is passed to svn as the value of |
570ac81865be
Add revision parameter to update so that a checkout can be updated to a
Bernhard Herzog <bh@intevation.de>
parents:
45
diff
changeset
|
49 the --revision option. |
570ac81865be
Add revision parameter to update so that a checkout can be updated to a
Bernhard Herzog <bh@intevation.de>
parents:
45
diff
changeset
|
50 """ |
208
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
51 args = [] |
79
570ac81865be
Add revision parameter to update so that a checkout can be updated to a
Bernhard Herzog <bh@intevation.de>
parents:
45
diff
changeset
|
52 if revision: |
208
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
53 args.extend(["--revision", revision]) |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
54 if not recurse: |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
55 args.append("-N") |
1527c37bd7aa
Allow checkouts of specific revision and to prohibit recursion during
Bernhard Herzog <bh@intevation.de>
parents:
79
diff
changeset
|
56 run.call(cmdexpand("svn update -q @args $localdir", **locals())) |
0 | 57 |
266
e201ea1f6d0e
Add revision and recurse parameters to treepkg.subversion.export
Bernhard Herzog <bh@intevation.de>
parents:
262
diff
changeset
|
58 def export(src, dest, revision=None, recurse=True): |
0 | 59 """Runs svn export src dest""" |
266
e201ea1f6d0e
Add revision and recurse parameters to treepkg.subversion.export
Bernhard Herzog <bh@intevation.de>
parents:
262
diff
changeset
|
60 args = [] |
e201ea1f6d0e
Add revision and recurse parameters to treepkg.subversion.export
Bernhard Herzog <bh@intevation.de>
parents:
262
diff
changeset
|
61 if revision: |
e201ea1f6d0e
Add revision and recurse parameters to treepkg.subversion.export
Bernhard Herzog <bh@intevation.de>
parents:
262
diff
changeset
|
62 args.extend(["--revision", revision]) |
e201ea1f6d0e
Add revision and recurse parameters to treepkg.subversion.export
Bernhard Herzog <bh@intevation.de>
parents:
262
diff
changeset
|
63 if not recurse: |
e201ea1f6d0e
Add revision and recurse parameters to treepkg.subversion.export
Bernhard Herzog <bh@intevation.de>
parents:
262
diff
changeset
|
64 args.append("-N") |
e201ea1f6d0e
Add revision and recurse parameters to treepkg.subversion.export
Bernhard Herzog <bh@intevation.de>
parents:
262
diff
changeset
|
65 run.call(cmdexpand("svn export -q @args $src $dest", **locals())) |
0 | 66 |
67 def last_changed_revision(svn_working_copy): | |
68 """return the last changed revision of an SVN working copy as an int""" | |
69 # Make sure we run svn under the C locale to avoid localized | |
70 # messages | |
71 env = os.environ.copy() | |
72 env["LANG"] = "C" | |
73 | |
45
3e610233ccfe
use cmdexpand when calling subprocesses
Bernhard Herzog <bh@intevation.de>
parents:
0
diff
changeset
|
74 output = run.capture_output(cmdexpand("svn info $svn_working_copy", |
3e610233ccfe
use cmdexpand when calling subprocesses
Bernhard Herzog <bh@intevation.de>
parents:
0
diff
changeset
|
75 **locals()), |
3e610233ccfe
use cmdexpand when calling subprocesses
Bernhard Herzog <bh@intevation.de>
parents:
0
diff
changeset
|
76 env=env) |
269
97fd2584df5f
Make treepkg.subversion.last_changed_revision raise SubversionError if
Bernhard Herzog <bh@intevation.de>
parents:
266
diff
changeset
|
77 str_rev = extract_value_for_key(output.splitlines(), "Last Changed Rev:") |
97fd2584df5f
Make treepkg.subversion.last_changed_revision raise SubversionError if
Bernhard Herzog <bh@intevation.de>
parents:
266
diff
changeset
|
78 if str_rev is None: |
97fd2584df5f
Make treepkg.subversion.last_changed_revision raise SubversionError if
Bernhard Herzog <bh@intevation.de>
parents:
266
diff
changeset
|
79 raise SubversionError("Cannot determine last changed revision for %r" |
97fd2584df5f
Make treepkg.subversion.last_changed_revision raise SubversionError if
Bernhard Herzog <bh@intevation.de>
parents:
266
diff
changeset
|
80 % svn_working_copy) |
97fd2584df5f
Make treepkg.subversion.last_changed_revision raise SubversionError if
Bernhard Herzog <bh@intevation.de>
parents:
266
diff
changeset
|
81 return int(str_rev) |
224
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
82 |
303
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
83 def svn_url(url_or_working_copy): |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
84 """Returns the URL used for the working copy in svn_working_copy""" |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
85 # Make sure we run svn under the C locale to avoid localized |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
86 # messages |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
87 env = os.environ.copy() |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
88 env["LANG"] = "C" |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
89 |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
90 output = run.capture_output(cmdexpand("svn info $url_or_working_copy", |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
91 **locals()), |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
92 env=env) |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
93 return extract_value_for_key(output.splitlines(), "URL:") |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
94 |
282
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
95 def log_xml(url, base_revision): |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
96 """Return the log in XML of the repository at url from base_revision to HEAD |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
97 """ |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
98 args = ["--revision", str(base_revision) + ":HEAD", |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
99 "--verbose", |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
100 "--xml"] |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
101 return run.capture_output(cmdexpand("svn log @args $url", **locals())) |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
102 |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
103 |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
104 def extract_tag_revisions(xml_log): |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
105 """Extracts the revisions which changed an SVN tag since its creation |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
106 This includes the revision which created the tag and all subsequent |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
107 changes. The xml_log parameter should contain the xml-Version of |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
108 the SVN log of the tag that includes at least the revision that |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
109 created the tag and all the newer revisions. |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
110 """ |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
111 tree = etree.parse(StringIO.StringIO(xml_log)) |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
112 tag_revisions = tree.xpath("logentry/@revision" |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
113 "[.>=../../logentry/@revision" |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
114 "[../paths/path[@copyfrom-path]]]") |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
115 return tag_revisions |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
116 |
f58f9adb7dc3
Add functions to get SVN logs and extract tag revisions from it. Add
Bernhard Herzog <bh@intevation.de>
parents:
273
diff
changeset
|
117 |
224
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
118 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
119 class SvnRepository(object): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
120 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
121 """Describes a subversion repository""" |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
122 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
123 def __init__(self, url, external_subdirs=()): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
124 """Initialize the subversion repository description |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
125 Parameters: |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
126 url -- The url of the repository |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
127 external_subdirs -- A list of subdirectories which are managed |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
128 by svn externals definitions |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
129 """ |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
130 self.url = url |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
131 self.external_subdirs = external_subdirs |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
132 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
133 def checkout(self, localdir, revision=None): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
134 """Checks out the repository into localdir. The revision |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
135 parameter should be an and indicates the revision to check out. |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
136 """ |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
137 checkout(self.url, localdir, revision=revision) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
138 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
139 def export(self, localdir, destdir): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
140 """Exports the working copy in localdir to destdir""" |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
141 export(localdir, destdir) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
142 for subdir in self.external_subdirs: |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
143 absdir = os.path.join(destdir, subdir) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
144 if not os.path.isdir(absdir): |
228
d2ddd037ddaf
Fix a bug introduced by the subversion interface reorganization
Bernhard Herzog <bh@intevation.de>
parents:
224
diff
changeset
|
145 export(os.path.join(localdir, subdir), absdir) |
224
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
146 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
147 def last_changed_revision(self, localdir): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
148 """Returns the last changed revision of the working copy in localdir""" |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
149 return max([last_changed_revision(os.path.join(localdir, d)) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
150 for d in [localdir] + list(self.external_subdirs)]) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
151 |
303
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
152 def check_working_copy(self, localdir): |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
153 """Checks whether localdir contains a checkout of the |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
154 repository. The check compares the expected URL with the one |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
155 returned by svn info executed in localdir. Raises |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
156 SubversionUrlMismatchError if the URLs do not match. |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
157 """ |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
158 localurl = svn_url(localdir) |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
159 expected_url = svn_url(self.url) |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
160 if localurl != expected_url: |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
161 raise SubversionUrlMismatchError("Working copy in %r has URL %r," |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
162 " expected %r" |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
163 % (localdir, localurl, |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
164 expected_url)) |
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
165 |
224
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
166 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
167 class SvnWorkingCopy(object): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
168 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
169 """Represents a checkout of a subversion repository""" |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
170 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
171 def __init__(self, repository, localdir, logger=None): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
172 """ |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
173 Initialize the working copy. |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
174 Parameters: |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
175 repository -- The SvnRepository instance describing the |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
176 repository |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
177 localdir -- The directory for the working copy |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
178 logger -- logging object to use for some info/debug messages |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
179 """ |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
180 self.repository = repository |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
181 self.localdir = localdir |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
182 self.logger = logger |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
183 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
184 def log_info(self, *args): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
185 if self.logger is not None: |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
186 self.logger.info(*args) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
187 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
188 def update_or_checkout(self, revision=None): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
189 """Updates the working copy or creates by checking out the repository""" |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
190 if os.path.exists(self.localdir): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
191 self.log_info("Updating the working copy in %r", self.localdir) |
303
df01eb4dbfc5
Check the URL of a working copy when updating a track's working copy.
Bernhard Herzog <bh@intevation.de>
parents:
302
diff
changeset
|
192 self.repository.check_working_copy(self.localdir) |
224
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
193 update(self.localdir, revision=revision) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
194 else: |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
195 self.log_info("The working copy in %r doesn't exist yet." |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
196 " Checking out from %r", |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
197 self.localdir, self.repository.url) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
198 self.repository.checkout(self.localdir, revision=revision) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
199 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
200 def export(self, destdir): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
201 """Exports the working copy to destdir""" |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
202 self.repository.export(self.localdir, destdir) |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
203 |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
204 def last_changed_revision(self): |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
205 """Returns the last changed rev of the working copy""" |
6bac65dcf258
Handle the svn repositories and working copies in a more object oriented way
Bernhard Herzog <bh@intevation.de>
parents:
208
diff
changeset
|
206 return self.repository.last_changed_revision(self.localdir) |
230
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
207 |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
208 |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
209 class ManualWorkingCopy(object): |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
210 |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
211 """A manually managed working copy""" |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
212 |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
213 def __init__(self, directory): |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
214 self.directory = directory |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
215 |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
216 def update_or_checkout(self, revision=None, recurse=True): |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
217 """This method does nothing""" |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
218 pass |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
219 |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
220 def export(self, destdir): |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
221 """Copies the entire working copy to destdir""" |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
222 shutil.copytree(self.directory, destdir) |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
223 |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
224 def last_changed_revision(self): |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
225 """Always returns 0""" |
e387b879fd38
Add treepkg.subversion.ManualWorkingCopy. Same interface as
Bernhard Herzog <bh@intevation.de>
parents:
228
diff
changeset
|
226 return 0 |
273
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
227 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
228 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
229 class TagDetector(object): |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
230 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
231 """Class to automatically find SVN tags and help package them |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
232 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
233 The tags are found using three parameters: |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
234 url -- The base url of the SVN tags directory to use |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
235 pattern -- A regular expression matching the subdirectories to |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
236 consider in the tag directory specified by the url |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
237 subdir -- A subdirectory of the directory matched by pattern to |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
238 export and use to determine revision number |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
239 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
240 The subdir parameter is there to cope with the kdepim enterprise |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
241 tags. The URL for a tag is of the form |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
242 .../tags/kdepim/enterprise4.0.<date>.<rev> . Each such tag has |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
243 subdirectories for kdepim, kdelibs, etc. The url and pattern are |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
244 used to match the URL for the tag, and the subdir is used to select |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
245 which part of the tag is meant. |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
246 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
247 The subdir also determines which SVN directory's revision number is |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
248 used. Normally, just appending the subdir to the tag URL would be |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
249 enough for this, but the situation is more complex for |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
250 kdebase_workspace and kdebase_runtime, whose code comes from |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
251 different subdirectories of the kdebase-4.X-branch subdirectory (for |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
252 enterprise4 tags). Here the revision number must be taken from |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
253 kdebase-4.X-branch, but the URL to use when exporting the sources, |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
254 must refer to e.g. kdebase-4.1-branch/kdebase_workspace. To achieve |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
255 that, subdir may contain slashes to indicate subdirectories of |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
256 subdirectories, but only the first part of subdir (up to the first |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
257 slash) is used when determining the revision number. |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
258 """ |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
259 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
260 def __init__(self, url, pattern, subdir): |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
261 self.url = url |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
262 self.pattern = re.compile(pattern) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
263 self.subdir = subdir |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
264 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
265 def list_tags(self): |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
266 matches = [] |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
267 if self.url: |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
268 for tag in list_url(self.url): |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
269 if self.pattern.match(tag.rstrip("/")): |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
270 matches.append(tag) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
271 return sorted(matches) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
272 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
273 def newest_tag_revision(self): |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
274 """Determines the newest tag revision and returns (tagurl, revno) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
275 If no tag can be found, the method returns the tuple (None, None). |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
276 """ |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
277 candidates = self.list_tags() |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
278 urlrev = (None, None) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
279 if candidates: |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
280 newest = candidates[-1] |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
281 urlrev = self.determine_revision(self.url + "/" + newest, |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
282 self.subdir) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
283 return urlrev |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
284 |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
285 def determine_revision(self, baseurl, subdir): |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
286 urlrev = (None, None) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
287 revision_url = baseurl + "/" + subdir.split("/")[0] |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
288 try: |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
289 revision = last_changed_revision(revision_url) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
290 urlrev = (baseurl + "/" + subdir, revision) |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
291 except SubversionError: |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
292 pass |
4b700b39c32f
Refactoring: Move the TagDetector class into the treepkg.subversion module
Bernhard Herzog <bh@intevation.de>
parents:
269
diff
changeset
|
293 return urlrev |