evolve: prevent a crash in httpclient_pushobsmarkers() when pushing I've been running into a crash when pushing from my hg repo in a Fedora 16 VM to Win7 running 'hg serve', even with extensions disabled on both sides: ../hg push -r . pc pushing to http://192.168.1.4:8000/ searching for changes no changes found pushing 2 obsolescence markers (263 bytes) ** unknown exception encountered, please report by visiting ... File "hg-evolve/hgext/evolve.py", line 2482, in _pushobsolete remote.evoext_pushobsmarkers_0(obsdata) File "hg-evolve/hgext/evolve.py", line 2522, in httpclient_pushobsmarkers ret, output = self._call('evoext_pushobsmarkers_0', data=obsfile) ValueError: too many values to unpack I'm not sure how this repo differs from the one in the test suite, so I'm not sure how to craft a test for this. The failure occurs even when there _are_ csets to push. There was no crash if no obsolete markers needed to be pushed. At any rate, this code was stolen from httppeer._callpush(), where it calls self._call(). The socket exception handling wasn't necessary to fix the crash, but the calling code might as well be duplicated in its entirety. A successful push with this patch looks like this. Note the final line is _not_ in the output of the http push in test-simple4server.t: ../hg push -r . pc pushing to http://192.168.1.4:8000/ searching for changes remote has heads on branch 'default' that are not known locally: 3af110194a0c 56000e3ae44d 57ac6e51d290 7da4355c21b8 and 8 others remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 0 changes to 1 files (+1 heads) pushing 4 obsolescence markers (525 bytes) remote: 2 obsolescence markers added

     1

  $ hg init public

     2

  $ cd public

     3

  $ echo a > a

     4

  $ hg commit -A -m init

     5

  adding a

     6

  $ cd ..

     7

     8

  $ evolvepath=$(echo $(dirname $TESTDIR))/hgext/evolve.py

     9

  $ hg clone -U public private

    10

  $ cd private

    11

  $ cat >> .hg/hgrc <<EOF

    12

  > [extensions]

    13

  > evolve = $evolvepath

    14

  > [phases]

    15

  > publish = false

    16

  > EOF

    17

  $ cd ..

    18

    19

  $ cp -a private alice

    20

  $ cp -a private bob

    21

    22

  $ cd alice

    23

  $ hg update

    24

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    25

  $ echo a >> a

    26

  $ hg commit -u alice -m 'modify a'

    27

  $ hg push ../private

    28

  pushing to ../private

    29

  searching for changes

    30

  adding changesets

    31

  adding manifests

    32

  adding file changes

    33

  added 1 changesets with 1 changes to 1 files

    34

  $ hg log -r 'draft()'

    35

  changeset:   1:4d1169d82e47

    36

  tag:         tip

    37

  user:        alice

    38

  date:        Thu Jan 01 00:00:00 1970 +0000

    39

  summary:     modify a

    40

    41

    42

  $ cd ../bob

    43

  $ hg pull ../private

    44

  pulling from ../private

    45

  searching for changes

    46

  adding changesets

    47

  adding manifests

    48

  adding file changes

    49

  added 1 changesets with 1 changes to 1 files

    50

  pull obsolescence markers

    51

  (run 'hg update' to get a working copy)

    52

  $ hg log -r 'draft()'

    53

  changeset:   1:4d1169d82e47

    54

  tag:         tip

    55

  user:        alice

    56

  date:        Thu Jan 01 00:00:00 1970 +0000

    57

  summary:     modify a

    58

    59

  $ hg push ../public

    60

  pushing to ../public

    61

  searching for changes

    62

  adding changesets

    63

  adding manifests

    64

  adding file changes

    65

  added 1 changesets with 1 changes to 1 files

    66

  $ hg log -r 'draft()'

    67

    68

  $ cd ../alice

    69

  $ hg amend -m 'tweak a'

    70

  $ hg pull ../public

    71

  pulling from ../public

    72

  searching for changes

    73

  no changes found

    74

  pull obsolescence markers

    75

  1 new bumped changesets

    76

    77

  $ hg evolve -a

    78

  recreate:[2] tweak a

    79

  atop:[1] modify a

    80

  computing new diff

    81

  committed as 4d1169d82e47

    82

  working directory is now at 4d1169d82e47