tests/test-hgcia.t
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 23 Dec 2014 16:12:54 -0800
changeset 23663 a9853fc172d2
parent 16913 f2719b387380
permissions -rw-r--r--
trydiff: simplify checking for additions In the body of the loop in trydiff(), there are conditions like: addedset or (f in modifiedset and to is None) The second half of that expression is to account for the fact that merge-in additions appear as additions. By instead fixing up the sets of modified and added files to compensate for this fact, we can simplify the body of the loop. It also fixes one case where the addedset was checked without the additional check (the "have we already reported a copy above?" case in the code, also see fixed test case). The similar condition with 'removedset' in it seems to have served no purpose even before this change, so it could have been simplified even before.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     1
Test the CIA extension
7438
b80b944836ec Add hgcia to hgext
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     2
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     3
  $ cat >> $HGRCPATH <<EOF
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     4
  > [extensions]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     5
  > hgcia=
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     6
  > 
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     7
  > [hooks]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     8
  > changegroup.cia = python:hgext.hgcia.hook
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     9
  > 
14314
c322890b03e6 hgcia: Handle URL like in notify (issue2406)
Cédric Krier <ced@b2ck.com>
parents: 12429
diff changeset
    10
  > [web]
c322890b03e6 hgcia: Handle URL like in notify (issue2406)
Cédric Krier <ced@b2ck.com>
parents: 12429
diff changeset
    11
  > baseurl = http://hgserver/
c322890b03e6 hgcia: Handle URL like in notify (issue2406)
Cédric Krier <ced@b2ck.com>
parents: 12429
diff changeset
    12
  > 
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    13
  > [cia]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    14
  > user = testuser
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    15
  > project = testproject
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    16
  > test = True
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    17
  > EOF
7438
b80b944836ec Add hgcia to hgext
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    18
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    19
  $ hg init src
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    20
  $ hg init cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    21
  $ cd src
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    22
  $ echo foo > foo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    23
  $ hg ci -Amfoo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    24
  adding foo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    25
  $ hg push ../cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    26
  pushing to ../cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    27
  searching for changes
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    28
  adding changesets
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    29
  adding manifests
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    30
  adding file changes
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    31
  added 1 changesets with 1 changes to 1 files
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    32
  
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    33
  <message>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    34
    <generator>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    35
      <name>Mercurial (hgcia)</name>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    36
      <version>0.1</version>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    37
      <url>http://hg.kublai.com/mercurial/hgcia</url>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    38
      <user>testuser</user>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    39
    </generator>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    40
    <source>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    41
  <project>testproject</project>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    42
  <branch>default</branch>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    43
  </source>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    44
    <body>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    45
      <commit>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    46
        <author>test</author>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    47
        <version>0:e63c23eaa88a</version>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    48
        <log>foo</log>
14850
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    49
        <url>http://hgserver/rev/e63c23eaa88a</url>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    50
        <files><file uri="http://hgserver/file/e63c23eaa88a/foo" action="add">foo</file></files>
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    51
      </commit>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    52
    </body>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    53
    <timestamp>0</timestamp>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    54
  </message>
14850
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    55
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    56
  $ cat >> $HGRCPATH <<EOF
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    57
  > strip = 0
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    58
  > EOF
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    59
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    60
  $ echo bar > bar
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    61
  $ hg ci -Ambar
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    62
  adding bar
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    63
  $ hg push ../cia
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    64
  pushing to ../cia
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    65
  searching for changes
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    66
  adding changesets
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    67
  adding manifests
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    68
  adding file changes
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    69
  added 1 changesets with 1 changes to 1 files
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    70
  
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    71
  <message>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    72
    <generator>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    73
      <name>Mercurial (hgcia)</name>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    74
      <version>0.1</version>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    75
      <url>http://hg.kublai.com/mercurial/hgcia</url>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    76
      <user>testuser</user>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    77
    </generator>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    78
    <source>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    79
  <project>testproject</project>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    80
  <branch>default</branch>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    81
  </source>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    82
    <body>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    83
      <commit>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    84
        <author>test</author>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    85
        <version>1:c0c7cf58edc5</version>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    86
        <log>bar</log>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    87
        <url>http://hgserver/$TESTTMP/cia/rev/c0c7cf58edc5</url>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    88
        <files><file uri="http://hgserver/$TESTTMP/cia/file/c0c7cf58edc5/bar" action="add">bar</file></files>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    89
      </commit>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    90
    </body>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    91
    <timestamp>0</timestamp>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    92
  </message>
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14850
diff changeset
    93
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14850
diff changeset
    94
  $ cd ..