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

comparison mercurial/commands.py @ 3887:79e5a6e7c451

Merge with main

author	Brendan Cully <brendan@kublai.com>
date	Thu, 14 Dec 2006 13:49:33 -0800
parents	6081b4c68baf abaee83ce0a6
children	6b4127c7d52a

comparison

equal deleted inserted replaced

-:d83b125b7d7e
+:79e5a6e7c451
 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
-from demandload import demandload
+import demandimport; demandimport.enable()
 from node import *
 from i18n import gettext as _
-demandload(globals(), "bisect os re sys signal imp urllib pdb shlex stat")
+import bisect, os, re, sys, signal, imp, urllib, pdb, shlex, stat
-demandload(globals(), "fancyopts ui hg util lock revlog bundlerepo")
+import fancyopts, ui, hg, util, lock, revlog, bundlerepo
-demandload(globals(), "difflib patch time help mdiff tempfile")
+import difflib, patch, time, help, mdiff, tempfile
-demandload(globals(), "traceback errno version atexit")
+import traceback, errno, version, atexit
-demandload(globals(), "archival changegroup cmdutil hgweb.server sshserver")
+import archival, changegroup, cmdutil, hgweb.server, sshserver
 class UnknownCommand(Exception):
 """Exception raised if command is not in the command table."""
 class AmbiguousCommand(Exception):
 """Exception raised if command shortcut matches more than one command."""
 ui.status(_('changeset %s backs out changeset %s\n') %
 (nice(repo.changelog.tip()), nice(node)))
 if op1 != node:
 if opts['merge']:
 ui.status(_('merging with changeset %s\n') % nice(op1))
-n = _lookup(repo, hex(op1))
+hg.merge(repo, hex(op1))
-hg.merge(repo, n)
 else:
 ui.status(_('the backout changeset is a new head - '
 'do not forget to merge\n'))
 ui.status(_('(use "backout --merge" '
 'if you want to auto-merge)\n'))
 df = False
 if opts["date"]:
 df = util.matchdate(opts["date"])
 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)
 ui.write("%40s " % hex(m[f]))
 if ui.verbose:
 ui.write("%3s " % (m.execf(f) and "755" or "644"))
 ui.write("%s\n" % f)
-def merge(ui, repo, node=None, force=None, branch=None):
+def merge(ui, repo, node=None, force=None):
 """Merge working directory with another revision
 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
 head revision, and the repository contains exactly one other head,
 the other head is merged with by default.  Otherwise, an explicit
 revision to merge with must be provided.
 """
-if node or branch:
+if not 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))
 """
 gen = changegroup.readbundle(urllib.urlopen(fname), fname)
 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
 return postincoming(ui, repo, modheads, opts['update'])
-def update(ui, repo, node=None, clean=False, branch=None, date=None):
+def update(ui, repo, node=None, clean=False, date=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
 if date:
 if node:
 raise util.Abort(_("you can't specify a revision and a date"))
 node = cmdutil.finddate(ui, repo, date)
-node = _lookup(repo, node, branch)
 if clean:
 return hg.clean(repo, node)
 else:
 return hg.update(repo, node)
-def _lookup(repo, node, branch=None):
-if branch:
-repo.ui.warn(_("the --branch option is deprecated, "
-"please use 'hg branch' instead\n"))
-br = repo.branchlookup(branch=branch)
-found = []
-for x in br:
-if branch in br[x]:
-found.append(x)
-if len(found) > 1:
-repo.ui.warn(_("Found multiple heads for %s\n") % branch)
-for x in found:
-cmdutil.show_changeset(ui, repo, {}).show(changenode=x)
-raise util.Abort("")
-if len(found) == 1:
-node = found[0]
-repo.ui.warn(_("Using head %s for branch %s\n")
-% (short(node), branch))
-else:
-raise util.Abort(_("branch %s not found") % branch)
-else:
-node = node and repo.lookup(node) or repo.changelog.tip()
-return node
 def verify(ui, repo):
 """verify the integrity of the repository
 Verify the integrity of the current repository.
 ('u', 'user', None, _('print user who committed change')),
 ] + walkopts,
 _('hg grep [OPTION]... PATTERN [FILE]...')),
 "heads":
 (heads,
-[('b', 'branches', None, _('show branches (DEPRECATED)')),
+[('', 'style', '', _('display using template map file')),
-('', 'style', '', _('display using template map file')),
 ('r', 'rev', '', _('show only heads which are descendants of rev')),
 ('', 'template', '', _('display with template'))],
 _('hg heads [-r REV]')),
 "help": (help_, [], _('hg help [COMMAND]')),
 "identify|id": (identify, [], _('hg identify')),
 "import|patch":
 (import_,
 [('p', 'strip', 1,
 _('directory strip option for patch. This has the same\n'
 'meaning as the corresponding patch option')),
-('b', 'base', '', _('base path (DEPRECATED)')),
+('b', 'base', '', _('base path')),
 ('f', 'force', None,
 _('skip check for outstanding uncommitted changes'))] + commitopts,
 _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
 "incoming|in": (incoming,
 [('M', 'no-merges', None, _('do not show merges')),
 _('print complete paths from the filesystem root')),
 ] + walkopts,
 _('hg locate [OPTION]... [PATTERN]...')),
 "^log|history":
 (log,
-[('b', 'branches', None, _('show branches (DEPRECATED)')),
+[('f', 'follow', None,
-('f', 'follow', None,
 _('follow changeset history, or file history across copies and renames')),
 ('', 'follow-first', None,
 _('only follow the first parent of merge changesets')),
 ('d', 'date', '', _('show revs matching date spec')),
 ('C', 'copies', None, _('show copied files')),
 ] + walkopts,
 _('hg log [OPTION]... [FILE]')),
 "manifest": (manifest, [], _('hg manifest [REV]')),
 "merge":
 (merge,
-[('b', 'branch', '', _('merge with head of a specific branch (DEPRECATED)')),
+[('f', 'force', None, _('force a merge with outstanding changes'))],
-('f', 'force', None, _('force a merge with outstanding changes'))],
 _('hg merge [-f] [REV]')),
 "outgoing|out": (outgoing,
 [('M', 'no-merges', None, _('do not show merges')),
 ('f', 'force', None,
 _('run even when remote repository is unrelated')),
 ('', 'template', '', _('display with template')),
 ] + remoteopts,
 _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
 "^parents":
 (parents,
-[('b', 'branches', None, _('show branches (DEPRECATED)')),
+[('r', 'rev', '', _('show parents from the specified rev')),
-('r', 'rev', '', _('show parents from the specified rev')),
 ('', 'style', '', _('display using template map file')),
 ('', 'template', '', _('display with template'))],
 _('hg parents [-r REV] [FILE]')),
 "paths": (paths, [], _('hg paths [NAME]')),
 "^pull":
 ('r', 'rev', '', _('revision to tag'))],
 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
 "tags": (tags, [], _('hg tags')),
 "tip":
 (tip,
-[('b', 'branches', None, _('show branches (DEPRECATED)')),
+[('', 'style', '', _('display using template map file')),
-('', 'style', '', _('display using template map file')),
 ('p', 'patch', None, _('show patch')),
 ('', 'template', '', _('display with template'))],
 _('hg tip [-p]')),
 "unbundle":
 (unbundle,
 [('u', 'update', None,
 _('update to new tip if changesets were unbundled'))],
 _('hg unbundle [-u] FILE')),
 "^update|up|checkout|co":
 (update,
-[('b', 'branch', '',
+[('C', 'clean', None, _('overwrite locally modified files')),
-_('checkout the head of a specific branch (DEPRECATED)')),
-('C', 'clean', None, _('overwrite locally modified files')),
 ('d', 'date', '', _('tipmost revision matching date'))],
 _('hg update [-C] [-d DATE] [REV]')),
 "verify": (verify, [], _('hg verify')),
 "version": (version_, [], _('hg version')),
 }

Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 3887:79e5a6e7c451