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

equal deleted inserted replaced

-:b70740aefa4d
+:ef8ee4477019
 matches = filter(matchfn, changefiles)
 if matches:
 fncache[rev] = matches
 wanted[rev] = 1
-class followfilter:
+def iterate():
-def __init__(self, onlyfirst=False):
+class followfilter:
-self.startrev = -1
+def __init__(self, onlyfirst=False):
-self.roots = []
+self.startrev = -1
-self.onlyfirst = onlyfirst
+self.roots = []
+self.onlyfirst = onlyfirst
-def match(self, rev):
-def realparents(rev):
+def match(self, rev):
-if self.onlyfirst:
+def realparents(rev):
-return repo.changelog.parentrevs(rev)[0:1]
+if self.onlyfirst:
+return repo.changelog.parentrevs(rev)[0:1]
+else:
+return filter(lambda x: x != -1, repo.changelog.parentrevs(rev))
+if self.startrev == -1:
+self.startrev = rev
+return True
+if rev > self.startrev:
+# forward: all descendants
+if not self.roots:
+self.roots.append(self.startrev)
+for parent in realparents(rev):
+if parent in self.roots:
+self.roots.append(rev)
+return True
 else:
-return filter(lambda x: x != -1, repo.changelog.parentrevs(rev))
+# backwards: all parents
+if not self.roots:
-if self.startrev == -1:
+self.roots.extend(realparents(self.startrev))
-self.startrev = rev
+if rev in self.roots:
-return True
+self.roots.remove(rev)
+self.roots.extend(realparents(rev))
-if rev > self.startrev:
-# forward: all descendants
-if not self.roots:
-self.roots.append(self.startrev)
-for parent in realparents(rev):
-if parent in self.roots:
-self.roots.append(rev)
 return True
-else:
-# backwards: all parents
+return False
-if not self.roots:
-self.roots.extend(realparents(self.startrev))
-if rev in self.roots:
-self.roots.remove(rev)
-self.roots.extend(realparents(rev))
-return True
-return False
-# it might be worthwhile to do this in the iterator if the rev range
-# is descending and the prune args are all within that range
-for rev in opts.get('prune', ()):
-rev = repo.changelog.rev(repo.lookup(rev))
-ff = followfilter()
-stop = min(revs[0], revs[-1])
-for x in range(rev, stop-1, -1):
-if ff.match(x) and wanted.has_key(x):
-del wanted[x]
-def iterate():
 if follow and not files:
 ff = followfilter(onlyfirst=opts.get('follow_first'))
 def want(rev):
-if ff.match(rev) and rev in wanted:
+if rev not in wanted:
-return True
+return False
-return False
+return ff.match(rev)
 else:
 def want(rev):
 return rev in wanted
 for i, window in increasing_windows(0, len(revs)):
 node1, node2 = revpair(ui, repo, opts['rev'])
 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
 patch.diff(repo, node1, node2, fns, match=matchfn,
-opts=ui.diffopts(opts))
+opts=patch.diffopts(ui, opts))
 def export(ui, repo, *changesets, **opts):
 """dump the header and diffs for one or more changesets
 Print the changeset header and diffs for one or more revisions.
 if len(revs) > 1:
 ui.note(_('exporting patches:\n'))
 else:
 ui.note(_('exporting patch:\n'))
 patch.export(repo, map(repo.lookup, revs), template=opts['output'],
-switch_parent=opts['switch_parent'], opts=ui.diffopts(opts))
+switch_parent=opts['switch_parent'],
+opts=patch.diffopts(ui, opts))
 def forget(ui, repo, *pats, **opts):
 """don't add the specified files on the next commit (DEPRECATED)
 (DEPRECATED)
 else:
 # launch the editor
 message = None
 ui.debug(_('message:\n%s\n') % message)
-files, fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root)
+files = patch.patch(strip, tmpname, ui, cwd=repo.root)
 removes = []
 if len(files) > 0:
 cfiles = files.keys()
 copies = []
 copts = {'after': False, 'force': False}
 Merge the contents of the current working directory and the
 requested revision. Files that changed between either parent are
 marked as changed for the next commit and a commit must be
 performed before any further updates are allowed.
+"""
-If no revision is specified, the working directory's parent is a
-head revision, and the repository contains exactly one other head,
+node = _lookup(repo, node, branch)
-the other head is merged with by default.  Otherwise, an explicit
-revision to merge with must be provided.
-"""
-if node:
-node = _lookup(repo, node, branch)
-else:
-heads = repo.heads()
-if len(heads) > 2:
-raise util.Abort(_('repo has %d heads - '
-'please merge with an explicit rev') %
-len(heads))
-if len(heads) == 1:
-raise util.Abort(_('there is nothing to merge - '
-'use "hg update" instead'))
-parent = repo.dirstate.parents()[0]
-if parent not in heads:
-raise util.Abort(_('working dir not at a head rev - '
-'use "hg update" or merge with an explicit rev'))
-node = parent == heads[0] and heads[-1] or heads[0]
 return hg.merge(repo, node, force=force)
 def outgoing(ui, repo, dest=None, **opts):
 """show changesets not found in destination
 (diff,
 [('r', 'rev', [], _('revision')),
 ('a', 'text', None, _('treat all files as text')),
 ('p', 'show-function', None,
 _('show which function each change is in')),
-('g', 'git', None, _('use git extended diff format')),
 ('w', 'ignore-all-space', None,
 _('ignore white space when comparing lines')),
 ('b', 'ignore-space-change', None,
 _('ignore changes in the amount of white space')),
 ('B', 'ignore-blank-lines', None,
 ('r', 'rev', [], _('show the specified revision or range')),
 ('M', 'no-merges', None, _('do not show merges')),
 ('', 'style', '', _('display using template map file')),
 ('m', 'only-merges', None, _('show only merges')),
 ('p', 'patch', None, _('show patch')),
-('P', 'prune', [], _('do not display revision or any of its ancestors')),
 ('', 'template', '', _('display with template')),
 ('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
 _('hg log [OPTION]... [FILE]')),
 "manifest": (manifest, [], _('hg manifest [REV]')),

changeset 2920	ef8ee4477019
parent 2907	b70740aefa4d
parent 2908	3848488244fc
child 2922	773c5b82d052