Rev 178: Removed replay legacy command. in http://bzr.daniel-watkins.co.uk/pqm/merge-directives

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/merge-directives

------------------------------------------------------------
revno: 178
revision-id: daniel at daniel-watkins.co.uk-20080823211714-ua0r3xxt21ebx8qq
parent: daniel at daniel-watkins.co.uk-20080823210635-6kdv2ebvcbozv76x
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: merge-directives
timestamp: Sat 2008-08-23 22:17:14 +0100
message:
  Removed replay legacy command.
-------------- next part --------------
=== modified file 'pqm/__init__.py'
--- a/pqm/__init__.py	2008-07-17 11:15:35 +0000
+++ b/pqm/__init__.py	2008-08-23 21:17:14 +0000
@@ -218,9 +218,6 @@
     def do_star_merge(self, sender, from_branch, local_dir):
         raise PQMTlaFailure(sender, 'Unsupported operation')
 
-    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')
     
@@ -261,10 +258,6 @@
         self.run_in_dir(dir, runtla, sender, 'commit', '-s', summary)
         logger.info("commit succeeded")
 
-    def do_replay(self, sender, from_branch, local_dir):
-        return self.run_in_dir(local_dir, runtla, sender, 'replay',
-                               '%s' % from_branch)
-
     def do_whereis_repo(self, sender, repo):
         return runtla(sender, 'whereis-archive', '%s' % (repo))
     

=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-08-23 21:06:35 +0000
+++ b/pqm/script.py	2008-08-23 21:17:14 +0000
@@ -838,7 +838,6 @@
 
 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*$')
@@ -921,7 +920,6 @@
         # its a command of some sort
         start_time = datetime.now()
         patch_match = self.patch_re.match(line)
-        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)
@@ -938,12 +936,6 @@
             self.accumulating_patch = True
         elif self.accumulating_patch:
             self.patch_content.append(line)
-        elif replay_match:
-            self.do_merge(from_repo_revision=replay_match.group(1),
-                          to_repo_revision=replay_match.group(2),
-                          merge_name='replay',
-                          merge_method="do_replay",
-                          line=line)
         elif repo_cache_match:
             # Cache a revision
             repo_revision = repo_cache_match.group(1)