Rev 214: Merged removal of obsolete Arch commands. in http://bzr.daniel-watkins.co.uk/pqm/abstract-patch
Daniel Watkins
daniel at daniel-watkins.co.uk
Tue Jul 22 19:53:56 BST 2008
At http://bzr.daniel-watkins.co.uk/pqm/abstract-patch
------------------------------------------------------------
revno: 214
revision-id: daniel at daniel-watkins.co.uk-20080722185226-1l05ep3k1z8cbw57
parent: daniel at daniel-watkins.co.uk-20080722184357-1f1yi38i0zbi82pn
parent: daniel at daniel-watkins.co.uk-20080718115939-sxlk84z6bmxaxau5
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: abstract-patch
timestamp: Tue 2008-07-22 19:52:26 +0100
message:
Merged removal of obsolete Arch commands.
modified:
manual.xml i_manual_for_the_tla_patch_queue_manager
pqm/__init__.py i_dc99ede3-0c64-434d-ac84-305c06455a8d
pqm/script.py script.py-20080528044209-lpacj0a0ub4woseh-2
------------------------------------------------------------
revno: 182.3.3
revision-id: daniel at daniel-watkins.co.uk-20080718115939-sxlk84z6bmxaxau5
parent: daniel at daniel-watkins.co.uk-20080718115617-8m7c1ee92xxr6rrf
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: remove-arch-commands
timestamp: Fri 2008-07-18 12:59:39 +0100
message:
Removed create-version command.
modified:
manual.xml i_manual_for_the_tla_patch_queue_manager
pqm/__init__.py i_dc99ede3-0c64-434d-ac84-305c06455a8d
pqm/script.py script.py-20080528044209-lpacj0a0ub4woseh-2
------------------------------------------------------------
revno: 182.3.2
revision-id: daniel at daniel-watkins.co.uk-20080718115617-8m7c1ee92xxr6rrf
parent: daniel at daniel-watkins.co.uk-20080718115417-ouh6s8e2auolpz96
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: remove-arch-commands
timestamp: Fri 2008-07-18 12:56:17 +0100
message:
Removed repo-uncache-revision command.
modified:
manual.xml i_manual_for_the_tla_patch_queue_manager
pqm/__init__.py i_dc99ede3-0c64-434d-ac84-305c06455a8d
pqm/script.py script.py-20080528044209-lpacj0a0ub4woseh-2
------------------------------------------------------------
revno: 182.3.1
revision-id: daniel at daniel-watkins.co.uk-20080718115417-ouh6s8e2auolpz96
parent: robertc at robertcollins.net-20080717100934-40fjde09nglggsub
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: remove-arch-commands
timestamp: Fri 2008-07-18 12:54:17 +0100
message:
Removed repo-cache-revision command.
modified:
manual.xml i_manual_for_the_tla_patch_queue_manager
pqm/__init__.py i_dc99ede3-0c64-434d-ac84-305c06455a8d
pqm/script.py script.py-20080528044209-lpacj0a0ub4woseh-2
-------------- next part --------------
=== modified file 'manual.xml'
--- a/manual.xml 2007-09-20 23:03:38 +0000
+++ b/manual.xml 2008-07-18 11:59:39 +0000
@@ -244,7 +244,7 @@
<para>
There are currently eight different actions that pqm
- can do. The first five commands
+ can do. The first two commands
</para>
<itemizedlist>
<listitem>
@@ -254,16 +254,6 @@
</listitem>
<listitem>
<simpara>
-repo-cache-revision REPOSITORY/REVISION
- </simpara>
- </listitem>
- <listitem>
- <simpara>
-repo-uncache-revision REPOSITORY/REVISION
- </simpara>
- </listitem>
- <listitem>
- <simpara>
tag FROM-REPOSITORY/FROM-REVISION TO-REPOSITORY/TO-REVISION
</simpara>
</listitem>
@@ -286,17 +276,6 @@
</itemizedlist>
<para>
- and to create a completely new line of development
- </para>
- <itemizedlist>
- <listitem>
- <simpara>
- create-version REPOSITORY/VERSION
- </simpara>
- </listitem>
- </itemizedlist>
-
- <para>
Again, the commit message will be the
<literal>Subject:</literal> line of your merge request.
</para>
@@ -304,16 +283,11 @@
<para>
So the first command you will use is probably
<literal>make-repo</literal>.
- If you are just starting development, you will then use
- <literal>create-version</literal>. If you have already
- started development, you will use
+ If you are just starting development, you will use
<literal>create-branch</literal>. The developers then branch
off of the patch queue manager's branch. When the developers
are ready, they will merge back with
- <literal>star-merge</literal>. You will use
- <literal>repo-cache-revision</literal> and
- <literal>repo-uncache-revision</literal> to speed up get's
- and free up space. Finally, you will use
+ <literal>star-merge</literal>. Finally, you will use
<literal>tag</literal> to mark a release.
</para>
=== modified file 'pqm/__init__.py'
--- a/pqm/__init__.py 2008-07-17 10:09:34 +0000
+++ b/pqm/__init__.py 2008-07-18 11:59:39 +0000
@@ -212,12 +212,6 @@
def do_replay(self, sender, from_branch, local_dir):
raise PQMTlaFailure(sender, 'Unsupported operation')
- def do_repo_cache(self, sender, fromrepo, fromrevision):
- raise PQMTlaFailure(sender, 'Unsupported operation')
-
- def do_repo_uncache(self, sender, fromrepo, fromrevision):
- raise PQMTlaFailure(sender, 'Unsupported operation')
-
def do_tag(self, sender, fromrepo, fromrevision, to_repo, to_revision):
raise PQMTlaFailure(sender, 'Unsupported operation')
@@ -226,9 +220,6 @@
def do_make_repo(self, sender, repo, location):
raise PQMTlaFailure(sender, 'Unsupported operation')
-
- def do_create_version(self, sender, repo, revision):
- raise PQMTlaFailure(sender, 'Unsupported operation')
def make_local_dir(self, sender, branch, output_dir):
raise PQMTlaFailure(sender, 'Unsupported operation')
@@ -278,14 +269,6 @@
return self.run_in_dir(local_dir, runtla, sender, 'merge',
'%s' % from_branch)
- def do_repo_cache(self, sender, fromrepo, fromrevision):
- return runtla(sender, 'archive-cache', '--add',
- '%s/%s' % (fromrepo, fromrevision))
-
- def do_repo_uncache(self, sender, fromrepo, fromrevision):
- return runtla(sender, 'archive-cache', '--delete',
- '%s/%s' % (fromrepo, fromrevision))
-
def do_tag(self, sender, fromrepo, fromrevision, to_repo, to_revision):
return runtla(sender, 'tag',
'%s/%s' % (to_repo, to_revision),
@@ -298,10 +281,6 @@
def do_make_repo(self, sender, repo, location):
return runtla(sender, 'make-archive',
'%s' % (repo), '%s' % (location))
-
- def do_create_version(self, sender, repo, revision):
- return runtla(sender, 'init',
- '%s/%s' % (repo, revision))
def do_whereis_repo(self, sender, repo):
return runtla(sender, 'archives', '%s/' % (repo))
@@ -313,12 +292,6 @@
return self.run_in_dir(local_dir, runtla, sender, 'star-merge',
'%s' % from_branch)
- def do_repo_cache(self, sender, fromrepo, fromrevision):
- return runtla(sender, 'cacherev', '%s/%s' % (fromrepo, fromrevision))
-
- def do_repo_uncache(self, sender, fromrepo, fromrevision):
- return runtla(sender, 'uncacherev', '%s/%s' % (fromrepo, fromrevision))
-
def do_tag(self, sender, fromrepo, fromrevision, to_repo, to_revision):
return runtla(sender, 'tag', '%s/%s' % (fromrepo, fromrevision),
'%s/%s' % (to_repo, to_revision))
@@ -328,19 +301,10 @@
def do_make_repo(self, sender, repo, location):
return runtla(sender, 'make-archive', '%s' % (repo), '%s' % (location))
-
- def do_create_version(self, sender, repo, revision):
- return runtla(sender, 'archive-setup', '%s/%s' % (to_repo, to_revision))
-
+
class BazBaseHandler(ArchHandler):
- def do_repo_cache(self, sender, fromrepo, fromrevision):
- return runtla(sender, 'cacherev', '%s/%s' % (fromrepo, fromrevision))
-
- def do_repo_uncache(self, sender, fromrepo, fromrevision):
- return runtla(sender, 'uncacherev', '%s/%s' % (fromrepo, fromrevision))
-
def do_tag(self, sender, fromrepo, fromrevision, to_repo, to_revision):
return runtla(sender, 'branch', '%s/%s' % (fromrepo, fromrevision),
'%s/%s' % (to_repo, to_revision))
@@ -357,9 +321,6 @@
def do_create_branch(self, sender, to_repo, to_revision):
return runtla(sender, 'archive-setup', '%s/%s' % (to_repo, to_revision))
-
- def do_create_version(self, sender, repo, revision):
- return runtla(sender, 'archive-setup', '%s/%s' % (to_repo, to_revision))
class Baz1_1Handler(BazBaseHandler):
=== modified file 'pqm/script.py'
--- a/pqm/script.py 2008-07-22 18:43:57 +0000
+++ b/pqm/script.py 2008-07-22 18:52:26 +0000
@@ -908,12 +908,9 @@
class CommandRunner(Command):
"""This runs commands as lines one at a time."""
replay_re = re.compile('^replay (\S+/\S+)\s+(\S+/\S+)\s*$')
- repo_cache_re = re.compile('^repo-cache-revision (\S+/\S+)\s*$')
- repo_uncache_re = re.compile('^repo-uncache-revision (\S+/\S+)\s*$')
tag_re = re.compile('^tag (\S+/\S+)\s+(\S+/\S+)\s*$')
make_repo_re = re.compile('^make-repo (\S+)\s+(\S+)\s*$')
create_branch_re = re.compile('^create-branch (\S+/\S+)\s+(\S+/\S+)\s*$')
- create_version_re = re.compile('^create-version (\S+/\S+)\s*$')
def asHTML(self):
"""Return an HTML representation of the command."""
@@ -952,12 +949,9 @@
# its a command of some sort
start_time = datetime.now()
replay_match = self.replay_re.match(line)
- repo_cache_match=self.repo_cache_re.match(line)
- repo_uncache_match=self.repo_uncache_re.match(line)
tag_match=self.tag_re.match(line)
create_branch_match=self.create_branch_re.match(line)
make_repo_match=self.make_repo_re.match(line)
- create_version_match=self.create_version_re.match(line)
logger = self.script.logger
if replay_match:
@@ -966,32 +960,6 @@
merge_name='replay',
merge_method="do_replay",
line=line)
- elif repo_cache_match:
- # Cache a revision
- repo_revision = repo_cache_match.group(1)
- (repo, revision) = repo_revision.split('/', 1)
- self.check_target(repo_revision, line)
- self.set_current_vcs(repo_revision)
- self.validate_revision(repo)
- self.output += ['\n', 'Executing repo-cache-revision %s/%s at %s' % (repo, revision,
- time.strftime('%c')), '\n']
- self.wrap_command(self.get_vcs().do_repo_cache, line, self.sender, repo, revision)
- logger.info("success: %s" % (line,))
- self.successful.append(line)
- self.output += self._success_output('repo-cache-revision', start_time)
- elif repo_uncache_match:
- # Uncache a revision
- repo_revision = repo_uncache_match.group(1)
- (repo, revision) = repo_revision.split('/', 1)
- self.check_target(repo_revision, line)
- self.set_current_vcs(repo_revision)
- self.validate_revision(repo)
- self.output += ['\n', 'Executing repo-uncache-revision %s/%s at %s' % (repo, revision,
- time.strftime('%c')), '\n']
- self.wrap_command(self.get_vcs().do_repo_uncache, line, self.sender, repo, revision)
- logger.info("success: %s" % (line,))
- self.successful.append(line)
- self.output += self._success_output('repo-uncache-revision', start_time)
elif tag_match:
# Tag a branch
from_repo_revision = tag_match.group(1)
@@ -1052,42 +1020,6 @@
logger.info("success: %s" % (line,))
self.successful.append(line)
self.output += self._success_output('make-repo', start_time)
- elif create_version_match:
- # Create a new line of development
- repo_revision = create_version_match.group(1)
- (repo, revision) = repo_revision.split('/', 1)
- self.set_current_vcs(repo_revision)
- self.validate_revision(repo_revision)
- self.check_target(repo_revision, line)
- logger.info("getting working dir for %s/%s" % (repo, revision))
-
- # TODO: Tim Penhey, 2008-05-28
- # Get rid of the imports from pqm module itself.
- from pqm import workdir
-
- dirpath=os.path.join(workdir, repo)
-
- if not os.access(dirpath, os.W_OK):
- os.mkdir(dirpath)
-
- os.chdir(dirpath)
- dir=os.path.join(dirpath, revision)
- if os.access(dir, os.W_OK):
- raise PQMException(self.sender, "Working dir already exists: " + dir)
- os.mkdir(dir)
-
- origdir = os.getcwd()
- self.output += ['\n', 'Executing create-version %s/%s at %s' % (repo, revision, time.strftime('%c')), '\n']
- try:
- os.chdir(dir)
- self.wrap_command(self.get_arch_impl().do_create_version, line, self.sender, repo, revision)
- except:
- os.chdir(origdir)
- raise
- os.chdir(origdir)
- logger.info("success: %s" % (line,))
- self.successful.append(line)
- self.output += self._success_output('create-version', start_time)
else:
self.unrecognized.append(line)
More information about the bazaar-commits
mailing list