Mercurial > hg
annotate tests/test-dirs.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 | c21aca51b392 |
children | 627cd8f33db0 |
rev | line source |
---|---|
43494
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
1 from __future__ import absolute_import |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
3 import unittest |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
4 |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
5 import silenttestrunner |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
6 |
43523
c21aca51b392
utils: move the `dirs` definition in pathutil (API)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43494
diff
changeset
|
7 from mercurial import pathutil |
43494
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
9 |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
10 class dirstests(unittest.TestCase): |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
11 def testdirs(self): |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
12 for case, want in [ |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
13 (b'a/a/a', [b'a', b'a/a', b'']), |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
14 (b'alpha/beta/gamma', [b'', b'alpha', b'alpha/beta']), |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
15 ]: |
43523
c21aca51b392
utils: move the `dirs` definition in pathutil (API)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43494
diff
changeset
|
16 d = pathutil.dirs({}) |
43494
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
17 d.addpath(case) |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
18 self.assertEqual(sorted(d), sorted(want)) |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
19 |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
20 def testinvalid(self): |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
21 with self.assertRaises(ValueError): |
43523
c21aca51b392
utils: move the `dirs` definition in pathutil (API)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43494
diff
changeset
|
22 d = pathutil.dirs({}) |
43494
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
23 d.addpath(b'a//b') |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
24 |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
25 |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
26 if __name__ == '__main__': |
5d40317d42b7
dirs: reject consecutive slashes in paths
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
27 silenttestrunner.main(__name__) |