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

equal deleted inserted replaced

-:d7c4b9bfcc94
+:5c5aaaa9ab6f
 We walk a window of revisions in the desired order.  Within the
 window, we first walk forwards to gather data, then in the desired
 order (usually backwards) to display it.
-This function returns an (iterator, getchange) pair.  The
+This function returns an (iterator, getchange, matchfn) tuple.  The
 getchange function returns the changelog entry for a numeric
 revision.  The iterator yields 3-tuples.  They will be of one of
 the following forms:
 "window", incrementing, lastrev: stepping through a window,
 possible display
 "iter", rev, None: in-order traversal of the revs earlier iterated
 over with "add" - use to display data'''
+files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
 if repo.changelog.count() == 0:
-return [], False
+return [], False, matchfn
-files, matchfn, anypats, cwd = matchpats(repo, pats, opts)
 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
 wanted = {}
 slowpath = anypats
 window = 300
 fncache = {}
 for rev in srevs:
 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
 yield 'add', rev, fns
 for rev in nrevs:
 yield 'iter', rev, None
-return iterate(), getchange
+return iterate(), getchange, matchfn
 revrangesep = ':'
 def revrange(ui, repo, revs, revlog=None):
 """Yield revision as strings from a list of revision specifications."""
 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
 text=opts['text'])
 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
 node = repo.lookup(changeset)
-prev, other = repo.changelog.parents(node)
+parents = [p for p in repo.changelog.parents(node) if p != nullid]
+prev = (parents and parents[0]) or nullid
 change = repo.changelog.read(node)
+if opts['switch_parent']:
+parents.reverse()
 fp = make_file(repo, repo.changelog, opts['output'],
 node=node, total=total, seqno=seqno,
 revwidth=revwidth)
 if fp != sys.stdout:
 ui.note("%s\n" % fp.name)
 fp.write("# HG changeset patch\n")
 fp.write("# User %s\n" % change[1])
 fp.write("# Node ID %s\n" % hex(node))
 fp.write("# Parent  %s\n" % hex(prev))
-if other != nullid:
+if len(parents) > 1:
-fp.write("# Parent  %s\n" % hex(other))
+fp.write("# Parent  %s\n" % hex(parents[1]))
 fp.write(change[4].rstrip())
 fp.write("\n\n")
 dodiff(fp, ui, repo, prev, node, text=opts['text'])
 if fp != sys.stdout:
 %r   zero-padded changeset revision number
 Without the -a option, export will avoid generating diffs of files
 it detects as binary. With -a, export will generate a diff anyway,
 probably with undesirable results.
+With the --switch-parent option, the diff will be against the second
+parent. It can be useful to review a merge.
 """
 if not changesets:
 raise util.Abort(_("export requires at least one changeset"))
 seqno = 0
 revs = list(revrange(ui, repo, changesets))
 counts[change] += 1
 return counts['+'], counts['-']
 fstate = {}
 skip = {}
-changeiter, getchange = walkchangerevs(ui, repo, pats, opts)
+changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
 count = 0
 incrementing = False
 for st, rev, fns in changeiter:
 if st == 'window':
 incrementing = rev
 def debug(self, *args):
 if self.debugflag:
 self.write(*args)
 def __getattr__(self, key):
 return getattr(self.ui, key)
-changeiter, getchange = walkchangerevs(ui, repo, pats, opts)
+changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
 for st, rev, fns in changeiter:
 if st == 'window':
 du = dui(ui)
 elif st == 'add':
 du.bump(rev)
 if opts['only_merges'] and len(parents) != 2:
 continue
 br = None
 if opts['keyword']:
-changes = repo.changelog.read(repo.changelog.node(rev))
+changes = getchange(rev)
 miss = 0
 for k in [kw.lower() for kw in opts['keyword']]:
 if not (k in changes[1].lower() or
 k in changes[4].lower() or
 k in " ".join(changes[3][:20]).lower()):
 br = repo.branchlookup([repo.changelog.node(rev)])
 show_changeset(du, repo, rev, brinfo=br)
 if opts['patch']:
 prev = (parents and parents[0]) or nullid
-dodiff(du, du, repo, prev, changenode, fns)
+dodiff(du, du, repo, prev, changenode, match=matchfn)
 du.write("\n\n")
 elif st == 'iter':
 for args in du.hunk[rev]:
 ui.write(*args)
 a change is visible for pull by other users, undoing it locally is
 ineffective.
 """
 repo.undo()
-def update(ui, repo, node=None, merge=False, clean=False, branch=None):
+def update(ui, repo, node=None, merge=False, clean=False, force=None,
+branch=None):
 """update or merge working directory
 Update the working directory to the specified revision.
 If there are no outstanding changes in the working directory and
 else:
 ui.warn(_("branch %s not found\n") % (branch))
 return 1
 else:
 node = node and repo.lookup(node) or repo.changelog.tip()
-return repo.update(node, allow=merge, force=clean)
+return repo.update(node, allow=merge, force=clean, forcemerge=force)
 def verify(ui, repo):
 """verify the integrity of the repository
 Verify the integrity of the current repository.
 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
 "^export":
 (export,
 [('o', 'output', "", _('print output to file with formatted name')),
-('a', 'text', None, _('treat all files as text'))],
+('a', 'text', None, _('treat all files as text')),
+('', 'switch-parent', None, _('diff against the second parent'))],
 "hg export [-a] [-o OUTFILE] REV..."),
 "forget":
 (forget,
 [('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
 "undo": (undo, [], _('hg undo')),
 "^update|up|checkout|co":
 (update,
 [('b', 'branch', "", _('checkout the head of a specific branch')),
 ('m', 'merge', None, _('allow merging of branches')),
-('C', 'clean', None, _('overwrite locally modified files'))],
+('C', 'clean', None, _('overwrite locally modified files')),
-_('hg update [-b TAG] [-m] [-C] [REV]')),
+('f', 'force', None, _('force a merge with outstanding changes'))],
+_('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
 "verify": (verify, [], _('hg verify')),
 "version": (show_version, [], _('hg version')),
 }
 globalopts = [

changeset 1586	5c5aaaa9ab6f
parent 1582	63799b01985c
parent 1581	db10b7114de0
child 1589	fce5292866c6