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

equal deleted inserted replaced

-:a11e13d50645
+:c927c568a5ad
 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
 prefix = cmdutil.make_filename(repo, prefix, node)
 archival.archive(repo, dest, node, kind, not opts['no_decode'],
 matchfn, prefix)
-def backout(ui, repo, rev, **opts):
+def backout(ui, repo, node=None, rev=None, **opts):
 '''reverse effect of earlier changeset
 Commit the backed out changes as a new changeset.  The new
 changeset is a child of the backed out changeset.
 The --merge option remembers the parent of the working directory
 before starting the backout, then merges the new head with that
 changeset afterwards.  This saves you from doing the merge by
 hand.  The result of this merge is not committed, as for a normal
 merge.'''
+if rev and node:
+raise util.Abort(_("please specify just one revision"))
+if not rev:
+rev = node
 bail_if_changed(repo)
 op1, op2 = repo.dirstate.parents()
 if op2 != nullid:
 raise util.Abort(_('outstanding uncommitted merge'))
 for p in patches:
 pf = os.path.join(d, p)
 if pf == '-':
 ui.status(_("applying patch from stdin\n"))
-tmpname, message, user, date, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
+tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
 else:
 ui.status(_("applying %s\n") % p)
-tmpname, message, user, date, nodeid, p1, p2 = patch.extract(ui, file(pf))
+tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf))
 if tmpname is None:
 raise util.Abort(_('no diffs found'))
 try:
 p2 = repo.lookup(p2 or hex(nullid))
 if p1 != wp[0].node():
 hg.clean(repo, p1, wlock=wlock)
 repo.dirstate.setparents(p1, p2)
+repo.dirstate.setbranch(branch or 'default')
 elif p2:
 try:
 p1 = repo.lookup(p1)
 p2 = repo.lookup(p2)
 if p1 == wp[0].node():
 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):
+def merge(ui, repo, node=None, force=None, rev=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
 If no revision is specified, the working directory's parent is a
 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 rev and node:
+raise util.Abort(_("please specify just one revision"))
+if not node:
+node = rev
 if not node:
 heads = repo.heads()
 if len(heads) > 2:
 raise util.Abort(_('repo has %d heads - '
 f = urllib.urlopen(fname)
 gen = changegroup.readbundle(f, fname)
 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
 return postincoming(ui, repo, modheads, opts['update'])
-def update(ui, repo, node=None, clean=False, date=None):
+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
 tip of the current branch if none is specified.
 merge command.
 By default, update will refuse to run if doing so would require
 discarding local changes.
 """
+if rev and node:
+raise util.Abort(_("please specify just one revision"))
+if not rev:
+rev = node
 if date:
-if node:
+if rev:
 raise util.Abort(_("you can't specify a revision and a date"))
-node = cmdutil.finddate(ui, repo, date)
+rev = cmdutil.finddate(ui, repo, date)
 if clean:
-return hg.clean(repo, node)
+return hg.clean(repo, rev)
 else:
-return hg.update(repo, node)
+return hg.update(repo, rev)
 def verify(ui, repo):
 """verify the integrity of the repository
 Verify the integrity of the current repository.
 [('', 'merge', None,
 _('merge with old dirstate parent after backout')),
 ('d', 'date', '', _('record datecode as commit date')),
 ('', 'parent', '', _('parent to choose when backing out merge')),
 ('u', 'user', '', _('record user as committer')),
+('r', 'rev', '', _('revision to backout')),
 ] + walkopts + commitopts,
-_('hg backout [OPTION]... REV')),
+_('hg backout [OPTION]... [-r] REV')),
 "branch": (branch,
 [('f', 'force', None,
 _('set branch name even if it shadows an existing branch'))],
 _('hg branch [NAME]')),
 "branches": (branches, [], _('hg branches')),
 ] + walkopts,
 _('hg log [OPTION]... [FILE]')),
 "manifest": (manifest, [], _('hg manifest [REV]')),
 "^merge":
 (merge,
-[('f', 'force', None, _('force a merge with outstanding changes'))],
+[('f', 'force', None, _('force a merge with outstanding changes')),
-_('hg merge [-f] [REV]')),
+('r', 'rev', '', _('revision to merge')),
+],
+_('hg merge [-f] [[-r] 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')),
 _('update to new tip if changesets were unbundled'))],
 _('hg unbundle [-u] FILE')),
 "^update|up|checkout|co":
 (update,
 [('C', 'clean', None, _('overwrite locally modified files')),
-('d', 'date', '', _('tipmost revision matching date'))],
+('d', 'date', '', _('tipmost revision matching date')),
-_('hg update [-C] [-d DATE] [REV]')),
+('r', 'rev', '', _('revision'))],
+_('hg update [-C] [-d DATE] [[-r] REV]')),
 "verify": (verify, [], _('hg verify')),
 "version": (version_, [], _('hg version')),
 }
 norepo = ("clone init version help debugancestor debugcomplete debugdata"

changeset 4484	c927c568a5ad
parent 4482	62019c4427e3
parent 4450	8fa54b9c6c5a
child 4488	649dd2492ae5