Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-prev-next.t
author Matt Harbison <matt_harbison@yahoo.com>
Thu, 05 Mar 2015 20:02:07 -0500
branchstable
changeset 1209 fa35aeb64d32
parent 1185 cc3e68120185
child 1427 fcc467ca740e
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
892
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset 
     1
 
  $ cat >> $HGRCPATH <<EOF
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset 
     2
 
  > [extensions]
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset 
     3
 
  > hgext.graphlog=
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset 
     4
 
  > EOF
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset 
     5
 
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
947fb5b1915b evolve: active bookmark should move when using prev/next (#37)
Olle Lundberg <geek@nerd.sh>
parents:
diff changeset 
     6
 







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




     7


hg prev -B should move active bookmark







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




     8


  $ hg init












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




     9


  $ touch a












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    10


  $ hg add a












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    11


  $ hg commit -m 'added a'












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    12


  $ touch b












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    13


  $ hg add b












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    14


  $ hg commit -m 'added b'












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    15


  $ hg bookmark mark












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    16


  $ hg bookmarks












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    17


   * mark                      1:6e742c9127b3







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    18


  $ hg prev -B







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    19


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












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    20


  [0] added a












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    21


  $ hg bookmarks












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    22


   * mark                      0:a154386e50d1












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    23









1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    24


hg next -B should move active bookmark












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    25


  $ hg next -B












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    26


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












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    27


  [1] added b












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    28


  $ hg bookmarks












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    29


   * mark                      1:6e742c9127b3












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    30














e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    31


hg prev should unset active bookmark












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    32


  $ hg prev












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    33


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












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    34


  [0] added a












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    35


  $ hg bookmarks












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    36


     mark                      1:6e742c9127b3












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    37









892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    38


hg next should move active bookmark







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    39


  $ hg bookmark mark2












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    40


  $ hg bookmarks












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    41


     mark                      1:6e742c9127b3












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    42


   * mark2                     0:a154386e50d1







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    43


  $ hg next












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    44


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












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    45


  [1] added b












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    46


  $ hg bookmarks







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    47


     mark                      1:6e742c9127b3












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    48


     mark2                     0:a154386e50d1












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    49














e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    50


  $ hg bookmark -d mark2












e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    51


  $ hg bookmark mark







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    52














947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    53


hg next/prev should not interfere with inactive bookmarks












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    54


  $ touch c












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    55


  $ hg add c












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    56


  $ hg commit -m 'added c'












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    57


  $ hg bookmark -r2 no-move







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    58


  $ hg prev -B







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    59


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












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    60


  [1] added b












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    61


  $ hg bookmarks












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    62


   * mark                      1:6e742c9127b3












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    63


     no-move                   2:4e26ef31f919







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    64


  $ hg next -B







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    65


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












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    66


  [2] added c












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    67


  $ hg bookmarks












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    68


   * mark                      2:4e26ef31f919












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    69


     no-move                   2:4e26ef31f919












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    70


  $ hg up 1












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    71


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







964






c768f7666106
test: update to output change introduced by future 3.1



Pierre-Yves David <pierre-yves.david@fb.com>


parents: 
892

diff
changeset




    72


  (leaving bookmark mark)







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    73


  $ hg next -B







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    74


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












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    75


  [2] added c












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    76


  $ hg bookmarks












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    77


     mark                      2:4e26ef31f919












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    78


     no-move                   2:4e26ef31f919







1160






e29a813f6af5
Make next/prev only move bookmarks optionally



Ryan McElroy <rmcelroy@fb.com>


parents: 
964

diff
changeset




    79


  $ hg prev -B







892






947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    80


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












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    81


  [1] added b












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    82


  $ hg bookmarks












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    83


     mark                      2:4e26ef31f919












947fb5b1915b
evolve: active bookmark should move when using prev/next (#37)



Olle Lundberg <geek@nerd.sh>


parents: 

diff
changeset




    84


     no-move                   2:4e26ef31f919














evolve