mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:595ba2537d4f
+:87158be081b8
 from node import hex, nullid, nullrev, short
 from repo import RepoError, NoCapability
 from i18n import _, gettext
 import os, re, sys
-import hg, util, revlog, bundlerepo, extensions, copies
+import hg, util, revlog, bundlerepo, extensions, copies, context
 import difflib, patch, time, help, mdiff, tempfile, url
 import version
 import archival, changegroup, cmdutil, hgweb.server, sshserver, hbisect
 import merge as merge_
 displayer = cmdutil.show_changeset(ui, repo, {})
 transition = (good and "good" or "bad")
 if len(nodes) == 1:
 # narrowed it down to a single revision
 ui.write(_("The first %s revision is:\n") % transition)
-displayer.show(changenode=nodes[0])
+displayer.show(repo[nodes[0]])
 else:
 # multiple possible revisions
 ui.write(_("Due to skipped revisions, the first "
 "%s revision could be any of:\n") % transition)
 for n in nodes:
-displayer.show(changenode=n)
+displayer.show(repo[n])
 def check_state(state, interactive=True):
 if not state['good'] or not state['bad']:
 if (good or bad or skip or reset) and interactive:
 return
 heads.extend(bheads)
 if not heads:
 return 1
 displayer = cmdutil.show_changeset(ui, repo, opts)
 for n in heads:
-displayer.show(changenode=n)
+displayer.show(repo[n])
 def help_(ui, name=None, with_version=False):
 """show help for a given topic or a help overview
 With no arguments, print a list of commands and short help.
 break
 parents = [p for p in other.changelog.parents(n) if p != nullid]
 if opts.get('no_merges') and len(parents) == 2:
 continue
 count += 1
-displayer.show(changenode=n)
+displayer.show(other[n])
 finally:
 if hasattr(other, 'close'):
 other.close()
 if cleanup:
 os.unlink(cleanup)
 only_branches = opts.get('only_branch')
 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
 for st, rev, fns in changeiter:
 if st == 'add':
-changenode = repo.changelog.node(rev)
 parents = [p for p in repo.changelog.parentrevs(rev)
 if p != nullrev]
 if opts.get('no_merges') and len(parents) == 2:
 continue
 if opts.get('only_merges') and len(parents) != 2:
 if opts.get('copies') and rev:
 for fn in get(rev)[3]:
 rename = getrenamed(fn, rev)
 if rename:
 copies.append((fn, rename[0]))
-displayer.show(rev, changenode, copies=copies)
+displayer.show(context.changectx(repo, rev), copies=copies)
 elif st == 'iter':
 if count == limit: break
 if displayer.flush(rev):
 count += 1
 break
 parents = [p for p in repo.changelog.parents(n) if p != nullid]
 if opts.get('no_merges') and len(parents) == 2:
 continue
 count += 1
-displayer.show(changenode=n)
+displayer.show(repo[n])
 def parents(ui, repo, file_=None, **opts):
 """show the parents of the working dir or revision
 Print the working directory's parent revisions. If a
 p = [cp.node() for cp in ctx.parents()]
 displayer = cmdutil.show_changeset(ui, repo, opts)
 for n in p:
 if n != nullid:
-displayer.show(changenode=n)
+displayer.show(repo[n])
 def paths(ui, repo, search=None):
 """show definition of symbolic path names
 Show definition of symbolic path name NAME. If no name is given, show
 If you have just made a commit, that commit will be the tip. If
 you have just pulled changes from another repository, the tip of
 that repository becomes the current tip. The "tip" tag is special
 and cannot be renamed or assigned to a different changeset.
 """
-cmdutil.show_changeset(ui, repo, opts).show(len(repo) - 1)
+cmdutil.show_changeset(ui, repo, opts).show(repo[len(repo) - 1])
 def unbundle(ui, repo, fname1, *fnames, **opts):
 """apply one or more changegroup files
 Apply one or more compressed changegroup files generated by the

changeset 7369	87158be081b8
parent 7364	ad7f736f3214
child 7372	e17dbf140035