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

equal deleted inserted replaced

-:1a09814a5b1f
+:ced2d3620f95
 files.sort()
 for f in files:
 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
+def merge(ui, repo, node=None, **opts):
+"""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
+performed before any further updates are allowed.
+"""
+return update(ui, repo, node=node, merge=True, **opts)
 def outgoing(ui, repo, dest="default-push", **opts):
 """show changesets not found in destination
 Show changesets not found in the specified destination repository or
 the default push location. These are the changesets that would be pushed
 return 1
 else:
 for name, path in ui.configitems("paths"):
 ui.write("%s = %s\n" % (name, path))
+def postincoming(ui, repo, modheads, optupdate):
+if modheads == 0:
+return
+if optupdate:
+if modheads == 1:
+return update(ui, repo)
+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:
+ui.status(_("(run 'hg update' to get a working copy)\n"))
 def pull(ui, repo, source="default", **opts):
 """pull changes from the specified source
 Pull changes from a remote repository to a local one.
 revs = None
 if opts['rev'] and not other.local():
 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
 elif opts['rev']:
 revs = [other.lookup(rev) for rev in opts['rev']]
-r = repo.pull(other, heads=revs, force=opts['force'])
+modheads = repo.pull(other, heads=revs, force=opts['force'])
-if not r:
+return postincoming(ui, repo, modheads, opts['update'])
-if opts['update']:
-return update(ui, repo)
-else:
-ui.status(_("(run 'hg update' to get a working copy)\n"))
-return r
 def push(ui, repo, dest="default-push", **opts):
 """push changes to the specified destination
 Push changes from the local repository to the given destination.
 other = hg.repository(ui, dest)
 revs = None
 if opts['rev']:
 revs = [repo.lookup(rev) for rev in opts['rev']]
 r = repo.push(other, opts['force'], revs=revs)
-return r
+return r == 0
 def rawcommit(ui, repo, *flist, **rc):
 """raw commit interface (DEPRECATED)
 (DEPRECATED)
 respond("not locked")
 continue
 respond("")
 r = repo.addchangegroup(fin)
-respond("")
+respond(str(r))
 optlist = "name templates style address port ipv6 accesslog errorlog"
 for o in optlist.split():
 if opts[o]:
 ui.setconfig("web", o, opts[o])
 yield chunk
 else:
 raise util.Abort(_("%s: unknown bundle compression type")
 % fname)
 gen = generator(util.filechunkiter(f, 4096))
-if repo.addchangegroup(util.chunkbuffer(gen)):
+modheads = repo.addchangegroup(util.chunkbuffer(gen))
-return 1
+return postincoming(ui, repo, modheads, opts['update'])
-if opts['update']:
-return update(ui, repo)
-else:
-ui.status(_("(run 'hg update' to get a working copy)\n"))
 def undo(ui, repo):
 """undo the last commit or pull
 Roll back the last pull or commit transaction on the
 ('', '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]')),
+"merge":
+(merge,
+[('b', 'branch', '', _('merge with head of a specific branch')),
+('', 'style', '', _('display using template map file')),
+('f', 'force', None, _('force a merge with outstanding changes')),
+('', 'template', '', _('display with template'))],
+_('hg merge [-b TAG] [-f] [REV]')),
 "outgoing|out": (outgoing,
 [('M', 'no-merges', None, _('do not show merges')),
 ('f', 'force', None,
 _('run even when remote repository is unrelated')),
 ('p', 'patch', None, _('show patch')),

changeset 2019	ced2d3620f95
parent 1996	4c70b10f0418
child 2020	00925397236c