mercurial: comparison mercurial/commands.py

equal deleted inserted replaced

-:e7d3b509af8b
+:08a0f04b56bd
 bad = []
 names = []
 m = cmdutil.match(repo, pats, opts)
 oldbad = m.bad
-m.bad = lambda x,y: bad.append(x) or oldbad(x,y)
+m.bad = lambda x, y: bad.append(x) or oldbad(x, y)
 for f in repo.walk(m):
 exact = m.exact(f)
 if exact or f not in repo.dirstate:
 names.append(f)
 sim = float(opts.get('similarity') or 0)
 except ValueError:
 raise util.Abort(_('similarity must be a number'))
 if sim < 0 or sim > 100:
 raise util.Abort(_('similarity must be between 0 and 100'))
-return cmdutil.addremove(repo, pats, opts, similarity=sim/100.)
+return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
 def annotate(ui, repo, *pats, **opts):
 """show changeset information by line for each file
 List changes in files, showing the revision id responsible for
 ('changeset', lambda x: short(x[0].node())),
 ('date', getdate),
 ('follow', lambda x: x[0].path()),
 ]
-if (not opts.get('user') and not opts.get('changeset') and not opts.get('date')
+if (not opts.get('user') and not opts.get('changeset')
-and not opts.get('follow')):
+and not opts.get('date') and not opts.get('follow')):
 opts['number'] = 1
 linenumber = opts.get('line_number') is not None
 if (linenumber and (not opts.get('changeset')) and (not opts.get('number'))):
 raise util.Abort(_('at least one of -n/-c is required for -l'))
 prefix = opts.get('prefix')
 if dest == '-':
 if kind == 'files':
 raise util.Abort(_('cannot archive plain files to stdout'))
 dest = sys.stdout
-if not prefix: prefix = os.path.basename(repo.root) + '-%h'
+if not prefix:
+prefix = os.path.basename(repo.root) + '-%h'
 prefix = cmdutil.make_filename(repo, prefix, node)
 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
 matchfn, prefix)
 def backout(ui, repo, node=None, rev=None, **opts):
 ui.status(_('changeset %s backs out changeset %s\n') %
 (nice(repo.changelog.tip()), nice(node)))
 if op1 != node:
 hg.clean(repo, op1, show_stats=False)
 if opts.get('merge'):
-ui.status(_('merging with changeset %s\n') % nice(repo.changelog.tip()))
+ui.status(_('merging with changeset %s\n')
+% nice(repo.changelog.tip()))
 hg.merge(repo, hex(repo.changelog.tip()))
 else:
 ui.status(_('the backout changeset is a new head - '
 'do not forget to merge\n'))
 ui.status(_('(use "backout --merge" '
 showdate = not nodates
 for file_, ent in sorted(repo.dirstate._map.iteritems()):
 if showdate:
 if ent[3] == -1:
 # Pad or slice to locale representation
-locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(0)))
+locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
+time.localtime(0)))
 timestr = 'unset'
-timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
+timestr = (timestr[:locale_len] +
+' ' * (locale_len - len(timestr)))
 else:
-timestr = time.strftime("%Y-%m-%d %H:%M:%S ", time.localtime(ent[3]))
+timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
+time.localtime(ent[3]))
 if ent[1] & 020000:
 mode = 'lnk'
 else:
 mode = '%3o' % (ent[1] & 0777)
 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
 def debugsub(ui, repo, rev=None):
 if rev == '':
 rev = None
-for k,v in sorted(repo[rev].substate.items()):
+for k, v in sorted(repo[rev].substate.items()):
 ui.write('path %s\n' % k)
 ui.write(' source   %s\n' % v[0])
 ui.write(' revision %s\n' % v[1])
 def debugdata(ui, file_, rev):
 continue
 visitedset.add(branch)
 bheads = repo.branchheads(branch, start, closed=closed)
 if not bheads:
 if not opts.get('rev'):
-ui.warn(_("no open branch heads on branch %s\n") % encodedbranch)
+ui.warn(_("no open branch heads on branch %s\n")
+% encodedbranch)
 elif branch != branchrev:
 ui.warn(_("no changes on branch %s containing %s are "
 "reachable from %s\n")
 % (encodedbranch, branchrev, opts.get('rev')))
 else:
 # list all option lists
 opt_output = []
 for title, options in option_lists:
 opt_output.append(("\n%s" % title, None))
 for shortopt, longopt, default, desc in options:
-if _("DEPRECATED") in desc and not ui.verbose: continue
+if _("DEPRECATED") in desc and not ui.verbose:
+continue
 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
 longopt and " --%s" % longopt),
 "%s%s" % (desc,
 default
 and _(" (default: %s)") % default
 files = {}
 try:
 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
 files=files, eolmode=None)
 finally:
-files = patch.updatedir(ui, repo, files, similarity=sim/100.)
+files = patch.updatedir(ui, repo, files,
+similarity=sim / 100.0)
 if not opts.get('no_commit'):
 m = cmdutil.matchfiles(repo, files or [])
 n = repo.commit(message, opts.get('user') or user,
 opts.get('date') or date, match=m,
 editor=cmdutil.commiteditor)
 end = opts.get('print0') and '\0' or '\n'
 rev = opts.get('rev') or None
 ret = 1
 m = cmdutil.match(repo, pats, opts, default='relglob')
-m.bad = lambda x,y: False
+m.bad = lambda x, y: False
 for abs in repo[rev].walk(m):
 if not rev and abs not in repo.dirstate:
 continue
 if opts.get('fullpath'):
 ui.write(repo.wjoin(abs), end)
 See pull for valid destination format details.
 """
 limit = cmdutil.loglimit(opts)
 dest, revs, checkout = hg.parseurl(
-ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev'))
+ui.expandpath(dest or 'default-push', dest or 'default'),
+opts.get('rev'))
 if revs:
 revs = [repo.lookup(rev) for rev in revs]
 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
 Please see 'hg help urls' for important details about ``ssh://``
 URLs. If DESTINATION is omitted, a default path will be used.
 """
 dest, revs, checkout = hg.parseurl(
-ui.expandpath(dest or 'default-push', dest or 'default'), opts.get('rev'))
+ui.expandpath(dest or 'default-push', dest or 'default'),
+opts.get('rev'))
 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
 if revs:
 revs = [repo.lookup(rev) for rev in revs]
 wlock = repo.wlock()
 try:
 # walk dirstate.
 m = cmdutil.match(repo, pats, opts)
-m.bad = lambda x,y: False
+m.bad = lambda x, y: False
 for abs in repo.walk(m):
 names[abs] = m.rel(abs), m.exact(abs)
 # walk target manifest.
 msg = xlist[1]
 if not isinstance(msg, basestring):
 msg = msg(abs)
 ui.status(msg % rel)
 for table, hitlist, misslist, backuphit, backupmiss in disptable:
-if abs not in table: continue
+if abs not in table:
+continue
 # file has changed in dirstate
 if mfentry:
 handle(hitlist, backuphit)
 elif misslist is not None:
 handle(misslist, backupmiss)
 elif exact:
 ui.warn(_('file not managed: %s\n') % rel)
 continue
 # file has not changed in dirstate
 if node == parent:
-if exact: ui.warn(_('no changes needed to %s\n') % rel)
+if exact:
+ui.warn(_('no changes needed to %s\n') % rel)
 continue
 if pmf is None:
 # only need parent manifest in this unlikely case,
 # so do not read by default
 pmf = repo[parent].manifest()
 class service(object):
 def init(self):
 util.set_signal_handler()
 self.httpd = server.create_server(baseui, repo)
-if not ui.verbose: return
+if not ui.verbose:
+return
 if self.httpd.prefix:
 prefix = self.httpd.prefix.strip('/') + '/'
 else:
 prefix = ''
 st.append([f for f in ms if f == 'u'])
 labels = [_('%d modified'), _('%d added'), _('%d removed'),
 _('%d deleted'), _('%d unknown'), _('%d ignored'),
 _('%d unresolved')]
 t = []
-for s,l in zip(st, labels):
+for s, l in zip(st, labels):
 if s:
 t.append(l % len(s))
 t = ', '.join(t)
 cleanworkdir = False
 "grep":
 (grep,
 [('0', 'print0', None, _('end fields with NUL')),
 ('', 'all', None, _('print all revisions that match')),
 ('f', 'follow', None,
-_('follow changeset history, or file history across copies and renames')),
+_('follow changeset history,'
+' or file history across copies and renames')),
 ('i', 'ignore-case', None, _('ignore case when matching')),
 ('l', 'files-with-matches', None,
 _('print only filenames and revisions that match')),
 ('n', 'line-number', None, _('print matching line numbers')),
 ('r', 'rev', [], _('search in given revision range')),
 _('directory strip option for patch. This has the same '
 'meaning as the corresponding patch option')),
 ('b', 'base', '', _('base path')),
 ('f', 'force', None,
 _('skip check for outstanding uncommitted changes')),
-('', 'no-commit', None, _("don't commit, just update the working directory")),
+('', 'no-commit', None,
+_("don't commit, just update the working directory")),
 ('', 'exact', None,
 _('apply patch to the nodes from which it was generated')),
 ('', 'import-branch', None,
 _('use any branch information in patch (implied by --exact)'))] +
 commitopts + commitopts2 + similarityopts,
 ] + walkopts,
 _('[OPTION]... [PATTERN]...')),
 "^log|history":
 (log,
 [('f', 'follow', None,
-_('follow changeset history, or file history across copies and renames')),
+_('follow changeset history,'
+' or file history across copies and renames')),
 ('', 'follow-first', None,
 _('only follow the first parent of merge changesets')),
 ('d', 'date', '', _('show revisions matching date spec')),
 ('C', 'copies', None, _('show copied files')),
 ('k', 'keyword', [], _('do case-insensitive search for a keyword')),
 ('', 'removed', None, _('include revisions where files were removed')),
 ('m', 'only-merges', None, _('show only merges')),
 ('u', 'user', [], _('revisions committed by user')),
 ('b', 'only-branch', [],
 _('show only changesets within the given named branch')),
-('P', 'prune', [], _('do not display revision or any of its ancestors')),
+('P', 'prune', [],
+_('do not display revision or any of its ancestors')),
 ] + logopts + walkopts,
 _('[OPTION]... [FILE]')),
 "manifest":
 (manifest,
 [('r', 'rev', '', _('revision to display'))],
 [('A', 'accesslog', '', _('name of access log file to write to')),
 ('d', 'daemon', None, _('run server in background')),
 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
 ('E', 'errorlog', '', _('name of error log file to write to')),
 ('p', 'port', 0, _('port to listen on (default: 8000)')),
-('a', 'address', '', _('address to listen on (default: all interfaces)')),
+('a', 'address', '',
-('', 'prefix', '', _('prefix path to serve from (default: server root)')),
+_('address to listen on (default: all interfaces)')),
+('', 'prefix', '',
+_('prefix path to serve from (default: server root)')),
 ('n', 'name', '',
 _('name to show in web pages (default: working directory)')),
 ('', 'webdir-conf', '', _('name of the webdir config file'
 ' (serve more than one repository)')),
 ('', 'pid-file', '', _('name of file to write process ID to')),

changeset 10282	08a0f04b56bd
parent 10270	c2e27f7966a7
child 10316	d117089386e2