]> thyrsus.com Git - rcs-fast-import.git/commitdiff
Handle resets with arguments.
authorEric S. Raymond <esr@thyrsus.com>
Sun, 14 Nov 2010 06:21:51 +0000 (01:21 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Sun, 14 Nov 2010 06:21:51 +0000 (01:21 -0500)
rcs-fast-import

index 7afc631a5b5e099ef911b161081d080cd2e3afda..e64555ab729bba63ff64858cb0bd661dac97140c 100755 (executable)
@@ -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)