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

equal deleted inserted replaced

-:ee983d0dbea8
+:4106dde15aed
 # of the GNU General Public License, incorporated herein by reference.
 import demandimport; demandimport.enable()
 from node import *
 from i18n import _
-import bisect, os, re, sys, urllib, shlex, stat
+import bisect, os, re, sys, urllib, stat
 import ui, hg, util, revlog, bundlerepo, extensions
 import difflib, patch, time, help, mdiff, tempfile
 import errno, version, socket
 import archival, changegroup, cmdutil, hgweb.server, sshserver
 if i[1]:
 option_lists.append((_("options:\n"), i[1]))
 addglobalopts(False)
-def helplist(select=None):
+def helplist(header, select=None):
 h = {}
 cmds = {}
 for c, e in table.items():
 f = c.split("|", 1)[0]
 if select and not select(f):
 if not doc:
 doc = _("(No help text available)")
 h[f] = doc.splitlines(0)[0].rstrip()
 cmds[f] = c.lstrip("^")
+if not h:
+ui.status(_('no commands defined\n'))
+return
+ui.status(header)
 fns = h.keys()
 fns.sort()
 m = max(map(len, fns))
 for f in fns:
 if ui.verbose:
 ui.status('\n')
 try:
 ct = mod.cmdtable
 except AttributeError:
-ct = None
+ct = {}
-if not ct:
-ui.status(_('no commands defined\n'))
-return
-ui.status(_('list of commands:\n\n'))
 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in ct])
-helplist(modcmds.has_key)
+helplist(_('list of commands:\n\n'), modcmds.has_key)
 if name and name != 'shortlist':
 i = None
 for f in (helpcmd, helptopic, helpext):
 try:
 ui.status(_("Mercurial Distributed SCM\n"))
 ui.status('\n')
 # list of commands
 if name == "shortlist":
-ui.status(_('basic commands:\n\n'))
+header = _('basic commands:\n\n')
 else:
-ui.status(_('list of commands:\n\n'))
+header = _('list of commands:\n\n')
-helplist()
+helplist(header)
 # list all option lists
 opt_output = []
 for title, options in option_lists:
 opt_output.append(("\n%s" % title, None))
 return 1
 else:
 for name, path in ui.configitems("paths"):
 ui.write("%s = %s\n" % (name, path))
-def postincoming(ui, repo, modheads, optupdate, wasempty):
+def postincoming(ui, repo, modheads, optupdate):
 if modheads == 0:
 return
 if optupdate:
-if wasempty:
+if modheads == 1:
-return hg.update(repo, repo.lookup('default'))
+return hg.update(repo, None)
-elif modheads == 1:
-return hg.update(repo, repo.changelog.tip()) # update
 else:
 ui.status(_("not updating, since new heads added\n"))
 if modheads > 1:
 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
 else:
 revs = [other.lookup(rev) for rev in revs]
 else:
 error = _("Other repository doesn't support revision lookup, so a rev cannot be specified.")
 raise util.Abort(error)
-wasempty = repo.changelog.count() == 0
 modheads = repo.pull(other, heads=revs, force=opts['force'])
-return postincoming(ui, repo, modheads, opts['update'], wasempty)
+return postincoming(ui, repo, modheads, opts['update'])
 def push(ui, repo, dest=None, **opts):
 """push changes to the specified destination
 Push changes from the local repository to the given destination.
 To undo a remove before that, see hg revert.
 Modified files and added files are not removed by default.  To
 remove them, use the -f/--force option.
 """
-names = []
 if not opts['after'] and not pats:
 raise util.Abort(_('no files specified'))
 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
 exact = dict.fromkeys(files)
 mardu = map(dict.fromkeys, repo.status(files=files, match=matchfn))[:5]
 Apply one or more compressed changegroup files generated by the
 bundle command.
 """
 fnames = (fname1,) + fnames
-result = None
-wasempty = repo.changelog.count() == 0
 for fname in fnames:
 if os.path.exists(fname):
 f = open(fname, "rb")
 else:
 f = urllib.urlopen(fname)
 gen = changegroup.readbundle(f, fname)
 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
-return postincoming(ui, repo, modheads, opts['update'], wasempty)
+return postincoming(ui, repo, modheads, opts['update'])
 def update(ui, repo, node=None, rev=None, clean=False, date=None):
 """update working directory
 Update the working directory to the specified revision, or the

changeset 4965	4106dde15aed
parent 4961	126f527b3ba3
parent 4938	02b127749dc0
child 4967	cf67b5f3743d