tests/test-default-push.t
author Gregory Szorc <gregory.szorc@gmail.com>
Sat, 05 Dec 2015 21:11:04 -0800
changeset 27266 4dccc37b87bd
parent 26820 71d5238f92e9
child 27437 52ae742c8035
permissions -rw-r--r--
ui: support declaring path push urls as sub-options Power users often want to apply per-path configuration options. For example, they may want to declare an alternate URL for push operations or declare a revset of revisions to push when `hg push` is used (as opposed to attempting to push all revisions by default). This patch establishes the use of sub-options (config options with ":" in the name) to declare additional behavior for paths. New sub-options are declared by using the new ``@ui.pathsuboption`` decorator. This decorator serves multiple purposes: * Declaring which sub-options are registered * Declaring how a sub-option maps to an attribute on ``path`` instances (this is needed to `hg paths` can render sub-options and values properly) * Validation and normalization of config options to attribute values * Allows extensions to declare new sub-options without monkeypatching * Allows extensions to overwrite built-in behavior for sub-option handling As convenient as the new option registration decorator is, extensions (and even core functionality) may still need an additional hook point to perform finalization of path instances. For example, they may wish to validate that multiple options/attributes aren't conflicting with each other. This hook point could be added later, if needed. To prove this new functionality works, we implement the "pushurl" path sub-option. This option declares the URL that `hg push` should use by default. We require that "pushurl" is an actual URL. This requirement might be controversial and could be dropped if there is opposition. However, objectors should read the complicated code in ui.path.__init__ and commands.push for resolving non-URL values before making a judgement. We also don't allow #fragment in the URLs. I intend to introduce a ":pushrev" (or similar) option to define a revset to control which revisions are pushed when "-r <rev>" isn't passed into `hg push`. This is much more powerful than #fragment and I don't think #fragment is useful enough to continue supporting. The [paths] section of the "config" help page has been updated significantly. `hg paths` has been taught to display path sub-options. The docs mention that "default-push" is now deprecated. However, there are several references to it that need to be cleaned up. A large part of this is converting more consumers to the new paths API. This will happen naturally as more path sub-options are added and more and more components need to access them.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     1
  $ hg init a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     2
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     3
  $ echo a > a/a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     4
  $ hg --cwd a ci -Ama
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     5
  adding a
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     6
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     7
  $ hg clone a c
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     8
  updating to branch default
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
     9
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    10
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    11
  $ hg clone a b
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    12
  updating to branch default
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    13
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    14
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    15
  $ echo b >> b/a
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    16
  $ hg --cwd b ci -mb
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    17
20558
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    18
Push should provide a hint when both 'default' and 'default-push' not set:
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    19
  $ cd c
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    20
  $ hg push --config paths.default=
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    21
  abort: default repository not configured!
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    22
  (see the "path" section in "hg help config")
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    23
  [255]
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    24
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    25
  $ cd ..
c4f45ce85351 push: provide a hint when no paths in configured (issue3692)
anuraggoel <anurag.dsps@gmail.com>
parents: 15447
diff changeset
    26
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    27
Push should push to 'default' when 'default-push' not set:
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    28
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    29
  $ hg --cwd b push
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
    30
  pushing to $TESTTMP/a (glob)
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    31
  searching for changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    32
  adding changesets
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    33
  adding manifests
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    34
  adding file changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    35
  added 1 changesets with 1 changes to 1 files
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    36
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    37
Push should push to 'default-push' when set:
2496
6dbb8ae0a0b3 add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    38
22837
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 20558
diff changeset
    39
  $ echo '[paths]' >> b/.hg/hgrc
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    40
  $ echo 'default-push = ../c' >> b/.hg/hgrc
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    41
  $ hg --cwd b push
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
    42
  pushing to $TESTTMP/c (glob)
12287
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    43
  searching for changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    44
  adding changesets
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    45
  adding manifests
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    46
  adding file changes
d8707306d667 tests: unify test-default-push
Adrian Buehlmann <adrian@cadifra.com>
parents: 2496
diff changeset
    47
  added 1 changesets with 1 changes to 1 files
26189
663fbc336e22 ui: change default path fallback mechanism (issue4796)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26057
diff changeset
    48
26820
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    49
Push should push to 'default-push' when 'default' is not set
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    50
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    51
  $ hg -q clone a push-default-only
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    52
  $ cd push-default-only
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    53
  $ rm .hg/hgrc
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    54
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    55
  $ touch foo
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    56
  $ hg -q commit -A -m 'add foo'
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    57
  $ hg --config paths.default-push=../a push
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    58
  pushing to $TESTTMP/a (glob)
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    59
  searching for changes
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    60
  adding changesets
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    61
  adding manifests
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    62
  adding file changes
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    63
  added 1 changesets with 1 changes to 1 files
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    64
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    65
  $ cd ..
71d5238f92e9 ui: support paths.default-push without paths.default set (issue4914)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26189
diff changeset
    66
26189
663fbc336e22 ui: change default path fallback mechanism (issue4796)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26057
diff changeset
    67
Pushing to a path that isn't defined should not fall back to default
663fbc336e22 ui: change default path fallback mechanism (issue4796)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26057
diff changeset
    68
663fbc336e22 ui: change default path fallback mechanism (issue4796)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26057
diff changeset
    69
  $ hg --cwd b push doesnotexist
663fbc336e22 ui: change default path fallback mechanism (issue4796)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26057
diff changeset
    70
  abort: repository doesnotexist does not exist!
663fbc336e22 ui: change default path fallback mechanism (issue4796)
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26057
diff changeset
    71
  [255]
27266
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    72
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    73
:pushurl is used when defined
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    74
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    75
  $ hg -q clone a pushurlsource
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    76
  $ hg -q clone a pushurldest
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    77
  $ cd pushurlsource
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    78
  $ cat > .hg/hgrc << EOF
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    79
  > [paths]
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    80
  > default = https://example.com/not/relevant
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    81
  > default:pushurl = file://`pwd`/../pushurldest
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    82
  > EOF
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    83
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    84
  $ touch pushurl
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    85
  $ hg -q commit -A -m 'add pushurl'
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    86
  $ hg push
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    87
  pushing to file:/*/$TESTTMP/pushurlsource/../pushurldest (glob)
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    88
  searching for changes
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    89
  adding changesets
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    90
  adding manifests
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    91
  adding file changes
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    92
  added 1 changesets with 1 changes to 1 files
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    93
4dccc37b87bd ui: support declaring path push urls as sub-options
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26820
diff changeset
    94
  $ cd ..