Mercurial > hg
annotate tests/revnamesext.py @ 44574:5205b46bd887
fix: add a -s option to format a revision and its descendants
`hg fix -r abc123` will format that commit but not its
descendants. That seems expected given the option name (`-r`), but
it's very rarely what the user wants to do. The problem is that any
descendants of that commit will not be formatted, leaving them as
orphans that are hard to evolve. They are hard to evolve because the
new parent will have formatting changes that the orphan doesn't have.
I talked to Danny Hooper (who wrote most of the fix extension) about
the problem and we agreed that deprecating `-r` in favor of a new `-s`
argument (mimicing rebase's `-s`) would be a good way of reducing the
risk that users end up with these hard-to-evolve orphans. So that's
what this patch implements.
Differential Revision: https://phab.mercurial-scm.org/D8287
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 13 Mar 2020 12:16:00 -0700 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
rev | line source |
---|---|
33048
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
1 # Dummy extension to define a namespace containing revision names |
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 |
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
3 from __future__ import absolute_import |
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
4 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
5 from mercurial import namespaces |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
6 |
33048
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
7 |
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
8 def reposetup(ui, repo): |
36548
086fc71fbb09
py3: mark all string literals in test-command-template.t as bytes
Yuya Nishihara <yuya@tcha.org>
parents:
33048
diff
changeset
|
9 names = {b'r%d' % rev: repo[rev].node() for rev in repo} |
33048
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
10 namemap = lambda r, name: names.get(name) |
36548
086fc71fbb09
py3: mark all string literals in test-command-template.t as bytes
Yuya Nishihara <yuya@tcha.org>
parents:
33048
diff
changeset
|
11 nodemap = lambda r, node: [b'r%d' % repo[node].rev()] |
33048
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
12 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
13 ns = namespaces.namespace( |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
14 b'revnames', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
15 templatename=b'revname', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
16 logname=b'revname', |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
17 listnames=lambda r: names.keys(), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
18 namemap=namemap, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
19 nodemap=nodemap, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36548
diff
changeset
|
20 ) |
33048
46fa46608ca5
namespaces: record and expose whether namespace is built-in
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
21 repo.names.addnamespace(ns) |