mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:8d791bea49d4
+:6e94c0365d98
 yield src, fn, util.pathto(cwd, fn), fn in exact
 return files, matchfn, walk()
 def walk(repo, pats, opts, head=''):
 files, matchfn, results = makewalk(repo, pats, opts, head)
-for r in results: yield r
+for r in results:
+yield r
 def walkchangerevs(ui, repo, cwd, pats, opts):
 # This code most commonly needs to iterate backwards over the
 # history it is interested in.  Doing so has awful
 # (quadratic-looking) performance, so we use iterators in a
 if filelog.count() == 0:
 slowpath = True
 break
 for rev in filerevgen(filelog):
 if rev <= maxrev:
-if rev < minrev: break
+if rev < minrev:
+break
 fncache.setdefault(rev, [])
 fncache[rev].append(file)
 wanted[rev] = 1
 if slowpath:
 # The slow path checks files modified in every changeset.
 fncache[rev] = matches
 wanted[rev] = 1
 for i in xrange(0, len(revs), window):
 yield 'window', revs[0] < revs[-1], revs[-1]
-nrevs = [rev for rev in revs[i : min(i + window, len(revs))]
+nrevs = [rev for rev in revs[i:min(i+window, len(revs))]
 if rev in wanted]
 srevs = list(nrevs)
 srevs.sort()
 for rev in srevs:
 fns = fncache.get(rev)
 inst.args[0])
 def make_file(repo, r, pat, node=None,
 total=None, seqno=None, revwidth=None, mode='wb'):
 if not pat or pat == '-':
-if 'w' in mode: return sys.stdout
+return 'w' in mode and sys.stdout or sys.stdin
-else: return sys.stdin
 if hasattr(pat, 'write') and 'w' in mode:
 return pat
 if hasattr(pat, 'read') and 'r' in mode:
 return pat
 return open(make_filename(repo, r, pat, node, total, seqno, revwidth),
 """add all new files, delete all missing files"""
 add, remove = [], []
 for src, abs, rel, exact in walk(repo, pats, opts):
 if src == 'f' and repo.dirstate.state(abs) == '?':
 add.append(abs)
-if not exact: ui.status('adding ', rel, '\n')
+if not exact:
+ui.status('adding ', rel, '\n')
 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
 remove.append(abs)
-if not exact: ui.status('removing ', rel, '\n')
+if not exact:
+ui.status('removing ', rel, '\n')
 repo.add(add)
 repo.remove(remove)
 def annotate(ui, repo, *pats, **opts):
 """show changeset information per file line"""
 def debugconfig(ui):
 """show combined config settings from all hgrc files"""
 try:
 repo = hg.repository(ui)
-except: pass
+except hg.RepoError:
+pass
 for section, name, value in ui.walkconfig():
 ui.write('%s.%s=%s\n' % (section, name, value))
 def debugstate(ui, repo):
 """show the contents of the current dirstate"""
 ui.write("}\n")
 def debugwalk(ui, repo, *pats, **opts):
 """show how files match on given patterns"""
 items = list(walk(repo, pats, opts))
-if not items: return
+if not items:
+return
 fmt = '%%s  %%-%ds  %%-%ds  %%s\n' % (
 max([len(abs) for (src, abs, rel, exact) in items]),
 max([len(rel) for (src, abs, rel, exact) in items]))
-exactly = {True: 'exact', False: ''}
 for src, abs, rel, exact in items:
-ui.write(fmt % (src, abs, rel, exactly[exact]))
+ui.write(fmt % (src, abs, rel, exact and 'exact' or ''))
 def diff(ui, repo, *pats, **opts):
 """diff working directory (or selected files)"""
 node1, node2 = None, None
 revs = [repo.lookup(x) for x in opts['rev']]
 fp.write("# Parent  %s\n" % hg.hex(other))
 fp.write(change[4].rstrip())
 fp.write("\n\n")
 dodiff(fp, ui, repo, prev, node, text=opts['text'])
-if fp != sys.stdout: fp.close()
+if fp != sys.stdout:
+fp.close()
 def export(ui, repo, *changesets, **opts):
 """dump the header and diffs for one or more changesets"""
 if not changesets:
 raise util.Abort("export requires at least one changeset")
 """don't add the specified files on the next commit"""
 forget = []
 for src, abs, rel, exact in walk(repo, pats, opts):
 if repo.dirstate.state(abs) == 'a':
 forget.append(abs)
-if not exact: ui.status('forgetting ', rel, '\n')
+if not exact:
+ui.status('forgetting ', rel, '\n')
 repo.forget(forget)
 def grep(ui, repo, pattern=None, *pats, **opts):
 """search for a pattern in specified files and revisions"""
-if pattern is None: pattern = opts['regexp']
+if pattern is None:
-if not pattern: raise util.Abort('no pattern to search for')
+pattern = opts['regexp']
+if not pattern:
+raise util.Abort('no pattern to search for')
 reflags = 0
-if opts['ignore_case']: reflags |= re.I
+if opts['ignore_case']:
+reflags |= re.I
 regexp = re.compile(pattern, reflags)
 sep, end = ':', '\n'
-if opts['null'] or opts['print0']: sep = end = '\0'
+if opts['null'] or opts['print0']:
+sep = end = '\0'
 fcache = {}
 def getfile(fn):
 if fn not in fcache:
 fcache[fn] = repo.file(fn)
 def matchlines(body):
 begin = 0
 linenum = 0
 while True:
 match = regexp.search(body, begin)
-if not match: break
+if not match:
+break
 mstart, mend = match.span()
 linenum += body.count('\n', begin, mstart) + 1
 lstart = body.rfind('\n', begin, mstart) + 1 or begin
 lend = body.find('\n', mend)
 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
 def __init__(self, line, linenum, colstart, colend):
 self.line = line
 self.linenum = linenum
 self.colstart = colstart
 self.colend = colend
-def __eq__(self, other): return self.line == other.line
+def __eq__(self, other):
-def __hash__(self): return hash(self.line)
+return self.line == other.line
+def __hash__(self):
+return hash(self.line)
 matches = {}
 def grepbody(fn, rev, body):
 matches[rev].setdefault(fn, {})
 m = matches[rev][fn]
 os.mkdir(dest)
 hg.repository(ui, dest, create=1)
 def locate(ui, repo, *pats, **opts):
 """locate files matching specific patterns"""
-end = '\n'
+end = opts['print0'] and '\0' or '\n'
-if opts['print0']: end = '\0'
 for src, abs, rel, exact in walk(repo, pats, opts, '(?:.*/|)'):
-if repo.dirstate.state(abs) == '?': continue
+if repo.dirstate.state(abs) == '?':
+continue
 if opts['fullpath']:
 ui.write(os.path.join(repo.root, abs), end)
 else:
 ui.write(rel, end)
 self.hunk = {}
 def bump(self, rev):
 self.rev = rev
 self.hunk[rev] = []
 def note(self, *args):
-if self.verbose: self.write(*args)
+if self.verbose:
+self.write(*args)
 def status(self, *args):
-if not self.quiet: self.write(*args)
+if not self.quiet:
+self.write(*args)
 def write(self, *args):
 self.hunk[self.rev].append(args)
 def __getattr__(self, key):
 return getattr(self.ui, key)
 cwd = repo.getcwd()
 def paths(ui, search=None):
 """show definition of symbolic path names"""
 try:
 repo = hg.repository(ui=ui)
-except:
+except hg.RepoError:
 pass
 if search:
 for name, path in ui.configitems("paths"):
 if name == search:
 "forget":
 (forget,
 [('I', 'include', [], 'include path in search'),
 ('X', 'exclude', [], 'exclude path from search')],
 "hg forget [OPTION]... FILE..."),
-"grep": (grep,
+"grep":
-[('0', 'print0', None, 'terminate file names with NUL'),
+(grep,
-('I', 'include', [], 'include path in search'),
+[('0', 'print0', None, 'terminate file names with NUL'),
-('X', 'exclude', [], 'include path in search'),
+('I', 'include', [], 'include path in search'),
-('Z', 'null', None, 'terminate file names with NUL'),
+('X', 'exclude', [], 'include path in search'),
-('a', 'all-revs', '', 'search all revs'),
+('Z', 'null', None, 'terminate file names with NUL'),
-('e', 'regexp', '', 'pattern to search for'),
+('a', 'all-revs', '', 'search all revs'),
-('f', 'full-path', None, 'print complete paths'),
+('e', 'regexp', '', 'pattern to search for'),
-('i', 'ignore-case', None, 'ignore case when matching'),
+('f', 'full-path', None, 'print complete paths'),
-('l', 'files-with-matches', None, 'print names of files with matches'),
+('i', 'ignore-case', None, 'ignore case when matching'),
-('n', 'line-number', '', 'print line numbers'),
+('l', 'files-with-matches', None, 'print names of files with matches'),
-('r', 'rev', [], 'search in revision rev'),
+('n', 'line-number', '', 'print line numbers'),
-('s', 'no-messages', None, 'do not print error messages'),
+('r', 'rev', [], 'search in revision rev'),
-('v', 'invert-match', None, 'select non-matching lines')],
+('s', 'no-messages', None, 'do not print error messages'),
-"hg grep [options] [pat] [files]"),
+('v', 'invert-match', None, 'select non-matching lines')],
+"hg grep [options] [pat] [files]"),
 "heads":
 (heads,
 [('b', 'branches', None, 'find branch info')],
 'hg heads [-b]'),
 "help": (help_, [], 'hg help [COMMAND]'),
 ('', 'profile', None, 'profile'),
 ('', 'version', None, 'output version information and exit'),
 ('h', 'help', None, 'display help and exit'),
 ]
-norepo = "clone init version help debugconfig debugdata" + \
+norepo = ("clone init version help debugconfig debugdata"
-" debugindex debugindexdot paths"
+" debugindex debugindexdot paths")
 def find(cmd):
 for e in table.keys():
 if re.match("(%s)$" % e, cmd):
 return e, table[e]
 if hasattr(inst, "code"):
 u.warn("abort: %s\n" % inst)
 elif hasattr(inst, "reason"):
 u.warn("abort: error: %s\n" % inst.reason[1])
 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
-if u.debugflag: u.warn("broken pipe\n")
+if u.debugflag:
+u.warn("broken pipe\n")
 else:
 raise
 except OSError, inst:
 if hasattr(inst, "filename"):
 u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))

changeset 1065	6e94c0365d98
parent 1062	6d5a62a549fa
child 1066	ea878688221e