tests/test-url-rev.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Tue, 05 Nov 2013 18:37:44 +0100
changeset 20221 7401bb54fe76
parent 18997 4cf09a1bf5b2
child 22380 82b2ba904e3e
permissions -rw-r--r--
push: more robust check for bundle fast path When all changesets in the local repo are either being pushed or remotly known, we can take a fast path when bundling changeset because we are certain all local deltas are computed againts base known remotely. So we have a check to detect this situation, when we did a bare push and nothing was excluded. In a coming refactoring, the discovery will run on filtered view and the content of `outgoing.excluded` will just include unserved (secret) changeset not filtered by the repoview used to call push (usually "visible"). So we need to check if there is both no excluded changeset and nothing filtered by the current repoview.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12300
diff changeset
     1
Test basic functionality of url#rev syntax
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     2
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
     3
  $ hg init repo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
     4
  $ cd repo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
     5
  $ echo a > a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
     6
  $ hg ci -qAm 'add a'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
     7
  $ hg branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
     8
  marked working directory as branch foo
15615
41885892796e branch: warn on branching
Matt Mackall <mpm@selenic.com>
parents: 15246
diff changeset
     9
  (branches are permanent and global, did you want a bookmark?)
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    10
  $ echo >> a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    11
  $ hg ci -m 'change a'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    12
  $ cd ..
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    13
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    14
  $ hg clone 'repo#foo' clone
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    15
  adding changesets
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    16
  adding manifests
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    17
  adding file changes
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    18
  added 2 changesets with 2 changes to 1 files
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    19
  updating to branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    20
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    21
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    22
  $ hg --cwd clone heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    23
  changeset:   1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    24
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    25
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    26
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    27
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    28
  summary:     change a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    29
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    30
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    31
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    32
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    33
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    34
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    35
  $ hg --cwd clone parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    36
  changeset:   1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    37
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    38
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    39
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    40
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    41
  summary:     change a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    42
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    43
  $ cat clone/.hg/hgrc
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    44
  [paths]
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 15246
diff changeset
    45
  default = $TESTTMP/repo#foo (glob)
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    46
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    47
Changing original repo:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    48
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    49
  $ cd repo
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    50
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    51
  $ echo >> a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    52
  $ hg ci -m 'new head of branch foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    53
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    54
  $ hg up -qC default
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    55
  $ echo bar > bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    56
  $ hg ci -qAm 'add bar'
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    57
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    58
  $ hg log
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    59
  changeset:   3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    60
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    61
  parent:      0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    62
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    63
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    64
  summary:     add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    65
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    66
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    67
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    68
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    69
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    70
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    71
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    72
  changeset:   1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    73
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    74
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    75
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    76
  summary:     change a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    77
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    78
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    79
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    80
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    81
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    82
  
18994
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    83
  $ hg -q outgoing '../clone'
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    84
  2:faba9097cad4
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    85
  3:4cd725637392
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    86
  $ hg summary --remote --config paths.default='../clone'
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    87
  parent: 3:4cd725637392 tip
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    88
   add bar
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    89
  branch: default
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    90
  commit: (clean)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    91
  update: (current)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    92
  remote: 2 outgoing
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    93
  $ hg -q outgoing '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    94
  2:faba9097cad4
18994
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    95
  $ hg summary --remote --config paths.default='../clone#foo'
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    96
  parent: 3:4cd725637392 tip
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    97
   add bar
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    98
  branch: default
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    99
  commit: (clean)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   100
  update: (current)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   101
  remote: 1 outgoing
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   102
18996
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   103
  $ hg -q --cwd ../clone incoming '../repo#foo'
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   104
  2:faba9097cad4
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   105
  $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo'
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   106
  parent: 1:cd2a86ecc814 tip
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   107
   change a
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   108
  branch: foo
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   109
  commit: (clean)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   110
  update: (current)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   111
  remote: 1 or more incoming
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   112
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   113
  $ hg -q push '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   114
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   115
  $ hg --cwd ../clone heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   116
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   117
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   118
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   119
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   120
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   121
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   122
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   123
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   124
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   125
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   126
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   127
  
18996
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   128
  $ hg -q --cwd ../clone incoming '../repo#foo'
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   129
  [1]
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   130
  $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo'
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   131
  parent: 1:cd2a86ecc814 
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   132
   change a
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   133
  branch: foo
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   134
  commit: (clean)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   135
  update: 1 new changesets (update)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   136
  remote: (synced)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   137
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   138
  $ cd ..
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   139
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   140
  $ cd clone
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   141
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
   142
  repository tip rolled back to revision 1 (undo push)
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   143
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   144
  $ hg -q incoming
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   145
  2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   146
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   147
  $ hg -q pull
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   148
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   149
  $ hg heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   150
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   151
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   152
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   153
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   154
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   155
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   156
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   157
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   158
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   159
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   160
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   161
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   162
Pull should not have updated:
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   163
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   164
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   165
  1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   166
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   167
Going back to the default branch:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   168
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   169
  $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   170
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   171
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   172
  $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   173
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   174
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   175
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   176
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   177
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   178
No new revs, no update:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   179
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   180
  $ hg pull -qu
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   181
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   182
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   183
  0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   184
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   185
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
   186
  repository tip rolled back to revision 1 (undo pull)
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   187
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   188
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   189
  0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   190
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   191
Pull -u takes us back to branch foo:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   192
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   193
  $ hg pull -qu
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   194
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   195
  $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   196
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   197
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   198
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   199
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   200
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   201
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   202
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   203
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
   204
  repository tip rolled back to revision 1 (undo pull)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
   205
  working directory now based on revision 0
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   206
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   207
  $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   208
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   209
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   210
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   211
  0:1f0dee641bb7
5224
20817af258d8 pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5223
diff changeset
   212
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   213
  $ hg heads -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   214
  1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   215
  0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   216
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   217
  $ hg pull -qur default default
5224
20817af258d8 pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5223
diff changeset
   218
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   219
  $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   220
  changeset:   3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   221
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   222
  parent:      0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   223
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   224
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   225
  summary:     add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   226
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   227
  $ hg heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   228
  changeset:   3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   229
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   230
  parent:      0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   231
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   232
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   233
  summary:     add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   234
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   235
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   236
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   237
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   238
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   239
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   240
  
15246
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   241
Test handling of invalid urls
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   242
15246
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   243
  $ hg id http://foo/?bar
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   244
  abort: unsupported URL component: "bar"
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   245
  [255]
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   246
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   247
  $ cd ..
18997
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   248
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   249
Test handling common incoming revisions between "default" and
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   250
"default-push"
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   251
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   252
  $ hg -R clone rollback
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   253
  repository tip rolled back to revision 1 (undo pull)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   254
  working directory now based on revision 0
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   255
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   256
  $ cd repo
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   257
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   258
  $ hg update -q -C default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   259
  $ echo modified >> bar
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   260
  $ hg commit -m "new head to push current default head"
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   261
  $ hg -q push -r ".^1" '../clone'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   262
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   263
  $ hg -q outgoing '../clone'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   264
  2:faba9097cad4
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   265
  4:d515801a8f3d
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   266
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   267
  $ hg summary --remote --config paths.default='../clone#default' --config paths.default-push='../clone#foo'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   268
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   269
   new head to push current default head
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   270
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   271
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   272
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   273
  remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   274
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   275
  $ hg summary --remote --config paths.default='../clone#foo' --config paths.default-push='../clone'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   276
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   277
   new head to push current default head
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   278
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   279
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   280
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   281
  remote: 2 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   282
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   283
  $ hg summary --remote --config paths.default='../clone' --config paths.default-push='../clone#foo'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   284
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   285
   new head to push current default head
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   286
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   287
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   288
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   289
  remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   290
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   291
  $ hg clone -q -r 0 . ../another
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   292
  $ hg -q outgoing '../another#default'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   293
  3:4cd725637392
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   294
  4:d515801a8f3d
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   295
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   296
  $ hg summary --remote --config paths.default='../another#default' --config paths.default-push='../clone#default'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   297
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   298
   new head to push current default head
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   299
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   300
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   301
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   302
  remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   303
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   304
  $ cd ..