Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmd_impls/graft.py @ 52379:0facc743b92f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: fix a few typos in doc comments
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 29 Nov 2024 19:24:07 -0500
parents 1802d9afddf7
children 99615755fb8e
comparison
equal deleted inserted replaced
52378:1802d9afddf7 52379:0facc743b92f
4 4
5 from .. import cmdutil, error, logcmdutil, merge as mergemod, state as statemod 5 from .. import cmdutil, error, logcmdutil, merge as mergemod, state as statemod
6 6
7 7
8 def cmd_graft(ui, repo, *revs, **opts): 8 def cmd_graft(ui, repo, *revs, **opts):
9 """implement the graft command as defined in mercuria/commands.py""" 9 """implement the graft command as defined in mercurial/commands.py"""
10 ret = _process_args(ui, repo, *revs, **opts) 10 ret = _process_args(ui, repo, *revs, **opts)
11 action, graftstate, args = ret 11 action, graftstate, args = ret
12 if action == "ERROR": 12 if action == "ERROR":
13 return -1 13 return -1
14 elif action == "ABORT": 14 elif action == "ABORT":
25 25
26 def _process_args(ui, repo, *revs, **opts): 26 def _process_args(ui, repo, *revs, **opts):
27 """process the graft command argument to figure out what to do 27 """process the graft command argument to figure out what to do
28 28
29 This also filter the selected revision to skip the one that cannot be graft 29 This also filter the selected revision to skip the one that cannot be graft
30 or were alredy grafted. 30 or were already grafted.
31 """ 31 """
32 if revs and opts.get('rev'): 32 if revs and opts.get('rev'):
33 ui.warn( 33 ui.warn(
34 _( 34 _(
35 b'warning: inconsistent use of --rev might give unexpected ' 35 b'warning: inconsistent use of --rev might give unexpected '