tests/test-url-rev.t
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 27 Jan 2015 09:22:59 -0500
changeset 24019 26fbf07482b2
parent 23055 392ed77879c3
child 25111 1ef96a3b8b89
permissions -rw-r--r--
_fm1readmarkers: generate list in C This moves perfloadmarkers from ! result: 63866 ! wall 0.239217 comb 0.250000 user 0.240000 sys 0.010000 (best of 42) to ! result: 63866 ! wall 0.218795 comb 0.210000 user 0.210000 sys 0.000000 (best of 46)
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
22837
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    44
  # example repository config (see "hg help config" for more info)
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    45
  [paths]
23055
392ed77879c3 tests: add "(glob)" to paths in test-url-rev.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22837
diff changeset
    46
  default = $TESTTMP/repo#foo (glob)
22837
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    47
  
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    48
  # path aliases to other clones of this repo in URLs or filesystem paths
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    49
  # (see "hg help config.paths" for more info)
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    50
  #
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    51
  # default-push = ssh://jdoe@example.net/hg/jdoes-fork
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    52
  # my-fork      = ssh://jdoe@example.net/hg/jdoes-fork
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    53
  # my-clone     = /home/jdoe/jdoes-clone
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    54
  
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    55
  [ui]
2be7d5ebd4d0 config: use the same hgrc for a cloned repo as for an uninitted repo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22380
diff changeset
    56
  # name and email (local to this repository, optional), e.g.
22380
82b2ba904e3e clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents: 18997
diff changeset
    57
  # username = Jane Doe <jdoe@example.com>
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    58
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    59
Changing original repo:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    60
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    61
  $ 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
    62
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    63
  $ echo >> a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    64
  $ hg ci -m 'new head of branch foo'
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
  $ hg up -qC default
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    67
  $ echo bar > bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    68
  $ 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
    69
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    70
  $ hg log
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    71
  changeset:   3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    72
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    73
  parent:      0:1f0dee641bb7
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:     add bar
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:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    79
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    80
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    81
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    82
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    83
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    84
  changeset:   1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    85
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    86
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    87
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    88
  summary:     change a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    89
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    90
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    91
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    92
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    93
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
    94
  
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 -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
    96
  2:faba9097cad4
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    97
  3:4cd725637392
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
    98
  $ 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
    99
  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
   100
   add bar
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   101
  branch: default
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   102
  commit: (clean)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   103
  update: (current)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   104
  remote: 2 outgoing
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   105
  $ hg -q outgoing '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   106
  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
   107
  $ 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
   108
  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
   109
   add bar
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   110
  branch: default
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   111
  commit: (clean)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   112
  update: (current)
32843795e9b3 summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 16913
diff changeset
   113
  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
   114
18996
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   115
  $ 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
   116
  2:faba9097cad4
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   117
  $ 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
   118
  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
   119
   change a
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   120
  branch: foo
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   121
  commit: (clean)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   122
  update: (current)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   123
  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
   124
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   125
  $ hg -q push '../clone#foo'
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   126
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   127
  $ hg --cwd ../clone heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   128
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   129
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   130
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   131
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   132
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   133
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   134
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   135
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   136
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   137
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   138
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   139
  
18996
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   140
  $ 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
   141
  [1]
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   142
  $ 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
   143
  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
   144
   change a
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   145
  branch: foo
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   146
  commit: (clean)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   147
  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
   148
  remote: (synced)
160d8416e286 summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18994
diff changeset
   149
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   150
  $ cd ..
5222
cbe6e263357b parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   151
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   152
  $ cd clone
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   153
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
   154
  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
   155
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   156
  $ hg -q incoming
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   157
  2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   158
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   159
  $ hg -q pull
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   160
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   161
  $ hg heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   162
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   163
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   164
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   165
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   166
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   167
  summary:     new head of branch foo
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
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   170
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   171
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   172
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   173
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   174
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
   175
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   176
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   177
  1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   178
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   179
Going back to the default branch:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   180
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   181
  $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   182
  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
   183
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   184
  $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   185
  changeset:   0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   186
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   187
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   188
  summary:     add a
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   189
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   190
No new revs, no update:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   191
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   192
  $ hg pull -qu
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   193
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   194
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   195
  0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   196
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   197
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
   198
  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
   199
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   200
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   201
  0:1f0dee641bb7
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
Pull -u takes us back to branch foo:
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   204
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   205
  $ hg pull -qu
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 parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   208
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   209
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   210
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   211
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   212
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   213
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   214
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   215
  $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 12847
diff changeset
   216
  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
   217
  working directory now based on revision 0
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   218
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   219
  $ hg up -C 0
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   220
  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
   221
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   222
  $ hg parents -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   223
  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
   224
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   225
  $ hg heads -q
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   226
  1:cd2a86ecc814
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   227
  0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   228
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   229
  $ 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
   230
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   231
  $ hg parents
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   232
  changeset:   3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   233
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   234
  parent:      0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   235
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   236
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   237
  summary:     add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   238
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   239
  $ hg heads
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   240
  changeset:   3:4cd725637392
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   241
  tag:         tip
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   242
  parent:      0:1f0dee641bb7
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   243
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   244
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   245
  summary:     add bar
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   246
  
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   247
  changeset:   2:faba9097cad4
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   248
  branch:      foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   249
  user:        test
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   250
  date:        Thu Jan 01 00:00:00 1970 +0000
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   251
  summary:     new head of branch foo
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   252
  
15246
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   253
Test handling of invalid urls
12300
ca31b0b2ac16 tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents: 8167
diff changeset
   254
15246
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   255
  $ hg id http://foo/?bar
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   256
  abort: unsupported URL component: "bar"
7b15dd9125b3 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents: 15131
diff changeset
   257
  [255]
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   258
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16107
diff changeset
   259
  $ cd ..
18997
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   260
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   261
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
   262
"default-push"
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   263
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   264
  $ hg -R clone rollback
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   265
  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
   266
  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
   267
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   268
  $ cd repo
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   269
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   270
  $ 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
   271
  $ echo modified >> bar
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   272
  $ 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
   273
  $ 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
   274
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   275
  $ hg -q outgoing '../clone'
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   276
  2:faba9097cad4
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   277
  4:d515801a8f3d
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   278
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   279
  $ 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
   280
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   281
   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
   282
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   283
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   284
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   285
  remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   286
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   287
  $ 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
   288
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   289
   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
   290
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   291
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   292
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   293
  remote: 2 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   294
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   295
  $ 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
   296
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   297
   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
   298
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   299
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   300
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   301
  remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   302
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   303
  $ 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
   304
  $ 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
   305
  3:4cd725637392
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   306
  4:d515801a8f3d
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   307
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   308
  $ 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
   309
  parent: 4:d515801a8f3d tip
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   310
   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
   311
  branch: default
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   312
  commit: (clean)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   313
  update: (current)
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   314
  remote: 1 outgoing
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   315
4cf09a1bf5b2 summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18996
diff changeset
   316
  $ cd ..