From f950e32a7dd4f9c58322edef861dceb1c6d8574d Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 13 Nov 2014 07:17:03 -0500 Subject: [PATCH] Version bump for release 0.7. --- NEWS | 3 +++ src | 31 +++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index d0ca914..e9329f5 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ ` src project news +0.7: 2014-11-13 + Bugfix release: fix initial file commit. There was a bug in my tests... + 0.6: 2014-11-12 Useful boilerplare in commit and amend message buffers. Tag names for revisions work; so does tag renaming. diff --git a/src b/src index 1328dd8..92df602 100755 --- a/src +++ b/src @@ -43,7 +43,7 @@ # Unmodified ' ' 'C' ' ' '.' # Renamed 'R' - - - # Deleted 'D' 'R' 'D' - -# Copied 'C' - - - +# Copied 'C' - - - # Ignored '!' 'I' 'I' 'I' # Updated/unmerged 'U' - - - # Missing - '!' '!' '!' @@ -56,7 +56,7 @@ import sys, os, subprocess, time, calendar, stat, glob, shutil -version=0.6 +version=0.7 def screenwidth(): "Return the current width of the terminal window." @@ -186,7 +186,7 @@ class History: return self.lockrevs[0] except IndexError: croak("no current revision? src checkout to recover") - def current_branch(self, reversed=False): + def current_branch(self, backwards=False): "Return a list of items that are descendants or ancestors of current." if debug >= DEBUG_SEQUENCE: print "current_branch(%s)" % self.current() @@ -206,7 +206,7 @@ class History: if s is None: break selection.append(self.by_revno(s)) - if reversed: + if backwards: selection.reverse() return selection def tip(self, rev=None): @@ -437,15 +437,15 @@ class CommandContext: if self.seq is None: croak("revision spec hasn't been resolved") return i in self.seq - def resolve(self, metadata, reversed=True): + def resolve(self, metadata, backwards=True): "Resolve a revision spec that may contain tags into revnos." if debug >= DEBUG_SEQUENCE: sys.stderr.write("Entering resolve with start=%s, end=%s\n" % (self.start, self.end)) if self.is_empty(): if self.default_to == "branch": - self.seq = metadata.current_branch(reversed=False) + self.seq = metadata.current_branch(backwards=False) elif self.default_to == "branch_reversed": - self.seq = metadata.current_branch(reversed=True) + self.seq = metadata.current_branch(backwards=True) else: self.seq = [] return self.seq @@ -460,7 +460,6 @@ class CommandContext: if backend.isbranch(part): part = backend.branch_to_tip(part) return metadata.native_to_revno(part) - croak("internal error: in %s, failed to resolve %s" % (metadata.name, token)) self.start = subresolve(self.start) self.end = subresolve(self.end) if self.end > len(metadata): @@ -472,8 +471,8 @@ class CommandContext: s = self.end while True: rev = metadata.revno_to_native(s) - next = backend.pred(rev) - s = metadata.native_to_revno(next) + nxt = backend.pred(rev) + s = metadata.native_to_revno(nxt) if s is None: croak("%s is not an ancestor of %s" % (self.start, self.end)) self.seq.append(s) @@ -483,8 +482,8 @@ class CommandContext: sys.stderr.write("selection: %s, branchwise is %s\n" % (self.seq, "on" if self.branchwise else "off")) for item in metadata.revlist: sys.stdout.write("%s\t%s\t%s\n" % (item.revno, item.date, item.revision)) - # Because in the branchwise case the seqence is generated in reverse - if reversed != self.branchwise: + # Because in the branchwise case the seqence is generated in reverse + if backwards != self.branchwise: self.seq.reverse() return [metadata.by_revno(s) for s in self.seq] @@ -542,7 +541,7 @@ The cut line and things below it will not become part of the comment text. if not self.comment.strip(): return False except IOError: - croak("in %s, amend aborted." % arg) + croak("edit aborted.") where = self.comment.find(CommentContext.COMMENT_CUTLINE) if where != -1: self.comment = self.comment[:where] @@ -626,7 +625,7 @@ def list_method(*args): width = screenwidth() for arg in ctx.args: sys.stdout.write("= %s %s\n" % (arg, ((width - len(arg) - 5) * "="))) - for item in ctx.resolve(History(arg), reversed=True): + for item in ctx.resolve(History(arg), backwards=True): # Must allow enough room for revno and date summary = item.log.strip()[:width - 34] if item.selected(): @@ -642,7 +641,7 @@ def log_method(*args): width = screenwidth() for arg in ctx.args: sys.stdout.write("= %s %s\n" % (arg, ((width - len(arg) - 5) * "="))) - for item in ctx.resolve(History(arg), reversed=True): + for item in ctx.resolve(History(arg), backwards=True): sys.stdout.write("%-4d | %s\n%s" % (item.revno,item.date,item.log)) sys.stdout.write(("-" * (width - 1)) + "\n") @@ -845,7 +844,7 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method): with backend.lifter(arg): set_method(name, revision, metadata, arg) if not quiet and len(args) > 1: - announce("in %s, %s %s = %s in %s" % (arg, legend, name, revno)) + announce("in %s, %s %s = %s" % (arg, legend, name, ctx.start)) def tag_method(*args): "Inspect, create, and delete tags." -- 2.43.0