Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/rewriteutil.py @ 43077:687b865b95ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
formatting: byteify all mercurial/ and hgext/ string literals Done with python3.7 contrib/byteify-strings.py -i $(hg files 'set:mercurial/**.py - mercurial/thirdparty/** + hgext/**.py - hgext/fsmonitor/pywatchman/** - mercurial/__init__.py') black -l 80 -t py33 -S $(hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**" - hgext/fsmonitor/pywatchman/**') # skip-blame mass-reformatting only Differential Revision: https://phab.mercurial-scm.org/D6972
author Augie Fackler <augie@google.com>
date Sun, 06 Oct 2019 09:48:39 -0400
parents 57875cf423c9
children a391d0710f22
comparison
equal deleted inserted replaced
43076:2372284d9457 43077:687b865b95ad
15 obsolete, 15 obsolete,
16 revset, 16 revset,
17 ) 17 )
18 18
19 19
20 def precheck(repo, revs, action='rewrite'): 20 def precheck(repo, revs, action=b'rewrite'):
21 """check if revs can be rewritten 21 """check if revs can be rewritten
22 action is used to control the error message. 22 action is used to control the error message.
23 23
24 Make sure this function is called after taking the lock. 24 Make sure this function is called after taking the lock.
25 """ 25 """
26 if node.nullrev in revs: 26 if node.nullrev in revs:
27 msg = _("cannot %s null changeset") % action 27 msg = _(b"cannot %s null changeset") % action
28 hint = _("no changeset checked out") 28 hint = _(b"no changeset checked out")
29 raise error.Abort(msg, hint=hint) 29 raise error.Abort(msg, hint=hint)
30 30
31 if len(repo[None].parents()) > 1: 31 if len(repo[None].parents()) > 1:
32 raise error.Abort(_("cannot %s while merging") % action) 32 raise error.Abort(_(b"cannot %s while merging") % action)
33 33
34 publicrevs = repo.revs('%ld and public()', revs) 34 publicrevs = repo.revs(b'%ld and public()', revs)
35 if publicrevs: 35 if publicrevs:
36 msg = _("cannot %s public changesets") % action 36 msg = _(b"cannot %s public changesets") % action
37 hint = _("see 'hg help phases' for details") 37 hint = _(b"see 'hg help phases' for details")
38 raise error.Abort(msg, hint=hint) 38 raise error.Abort(msg, hint=hint)
39 39
40 newunstable = disallowednewunstable(repo, revs) 40 newunstable = disallowednewunstable(repo, revs)
41 if newunstable: 41 if newunstable:
42 raise error.Abort(_("cannot %s changeset with children") % action) 42 raise error.Abort(_(b"cannot %s changeset with children") % action)
43 43
44 44
45 def disallowednewunstable(repo, revs): 45 def disallowednewunstable(repo, revs):
46 """Checks whether editing the revs will create new unstable changesets and 46 """Checks whether editing the revs will create new unstable changesets and
47 are we allowed to create them. 47 are we allowed to create them.
50 `experimental.evolution.allowunstable=True` 50 `experimental.evolution.allowunstable=True`
51 """ 51 """
52 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) 52 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
53 if allowunstable: 53 if allowunstable:
54 return revset.baseset() 54 return revset.baseset()
55 return repo.revs("(%ld::) - %ld", revs, revs) 55 return repo.revs(b"(%ld::) - %ld", revs, revs)