From: Eric S. Raymond Date: Sun, 9 Nov 2014 16:54:50 +0000 (-0500) Subject: Pass baserev down to the brabch method, we'll need it. X-Git-Tag: 0.3~7 X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=4a22d6dce389309622f091f6dc5262449e473399;p=src.git Pass baserev down to the brabch method, we'll need it. --- diff --git a/src b/src index c82f277..5f25b45 100755 --- a/src +++ b/src @@ -124,7 +124,7 @@ class RCSRevisionItem: self.log = "" self.date = None def selected(self): - return self.revision == self.master.lockrevs[0] + return self.revision == self.master.current() def unixtime(self): try: return calendar.timegm(time.strptime(self.date, "%Y-%m-%dT%H:%M:%SZ")) @@ -227,6 +227,8 @@ class History: return len(self.revlist) def __getitem__(self, i): return self.revlist[i] + def current(self): + return self.lockrevs[0] def tip(self): return self.revlist[0] def rcs_to_revno(self, revision): @@ -667,7 +669,7 @@ def tag_helper(args, legend, delete_method, set_method): else: croak("can't accept a range when %s setting" % legend) with backend.lifter(arg): - set_method(name, revision, arg) + set_method(name, revision, metadata.current(), arg) if not quiet and len(args) > 1: announce("%s %s = %s in " % (legend, name, revno, arg)) @@ -865,13 +867,13 @@ class RCS: def delete_tag(self, tagname, arg): "Delete a specified tag." do_or_die("rcs -n{0} {1}".format(tagname, arg)) - def set_tag(self, tagname, revision, arg): + def set_tag(self, tagname, revision, _baserev, arg): "Set a specified tag." do_or_die("rcs -N{0}:{1} {2}".format(tagname, revision, arg)) def delete_branch(self, branchname, arg): "Delete a specified branch." croak("branch deletion is not yet supported") - def set_branch(self, branchname, revision, arg): + def set_branch(self, branchname, revision, baserev, arg): "Set a specified branch." croak("branch creation is not yet supported") def move(self, source, target):