From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 14 Nov 2010 06:21:51 +0000 (-0500)
Subject: Handle resets with arguments.
X-Git-Tag: 0.1~9
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=6494b3c3ce90ec32de6770cbeb66e622e896ac7d;p=rcs-fast-import.git

Handle resets with arguments.
---

diff --git a/rcs-fast-import b/rcs-fast-import
index 7afc631..e64555a 100755
--- a/rcs-fast-import
+++ b/rcs-fast-import
@@ -514,8 +514,7 @@ class Repository:
                 elif isinstance(event, Reset) and event.committish is not None:
                     for commit in self.commits():
                         if commit.mark == event.committish:
-                            # FIXME: Not yet used for anything
-                            commit.resetlist.append(tag)
+                            commit.resetlist.append(event)
                             break
                     else:
                         raise FatalException("reset points at nonexistent %s"
@@ -696,6 +695,8 @@ class Generic:
         loud_remove(path)
         if commit.is_tip():
             self.maketag(commit.branch, str(rev.branch()), path)
+        for reset in commit.resetlist:
+            self.maketag(reset.ref, str(rev), path)
     def modify(self, event, path, mode, copyfile):
         "Perform file checkins and modifications,"
         sanecheck(event, path, mode, copyfile)