tests/test-bookmarks.t
changeset 13416 5431b3f3e52e
parent 13388 a184dbd9b2c5
child 13425 0fe36c347c00
equal deleted inserted replaced
13415:25b5694b9337 13416:5431b3f3e52e
    52   $ hg bookmark -r null Y
    52   $ hg bookmark -r null Y
    53 
    53 
    54 list bookmarks
    54 list bookmarks
    55 
    55 
    56   $ hg bookmarks
    56   $ hg bookmarks
    57    * X                         0:f7b1eb17ad24
    57      X                         0:f7b1eb17ad24
    58    * X2                        0:f7b1eb17ad24
    58      X2                        0:f7b1eb17ad24
    59      Y                         -1:000000000000
    59      Y                         -1:000000000000
    60 
    60 
    61   $ echo b > b
    61   $ echo b > b
    62   $ hg add b
    62   $ hg add b
    63   $ hg commit -m 1
    63   $ hg commit -m 1
    64 
    64 
    65 bookmarks revset
    65 bookmarks revset
    66 
    66 
    67   $ hg log -r 'bookmark()'
    67   $ hg log -r 'bookmark()'
    68   changeset:   1:925d80f479bb
    68   changeset:   0:f7b1eb17ad24
    69   bookmark:    X
    69   bookmark:    X
    70   bookmark:    X2
    70   bookmark:    X2
    71   tag:         tip
    71   user:        test
    72   user:        test
    72   date:        Thu Jan 01 00:00:00 1970 +0000
    73   date:        Thu Jan 01 00:00:00 1970 +0000
    73   summary:     0
    74   summary:     1
       
    75   
    74   
    76   $ hg log -r 'bookmark(Y)'
    75   $ hg log -r 'bookmark(Y)'
    77   $ hg log -r 'bookmark(X2)'
    76   $ hg log -r 'bookmark(X2)'
    78   changeset:   1:925d80f479bb
    77   changeset:   0:f7b1eb17ad24
    79   bookmark:    X
    78   bookmark:    X
    80   bookmark:    X2
    79   bookmark:    X2
    81   tag:         tip
    80   user:        test
    82   user:        test
    81   date:        Thu Jan 01 00:00:00 1970 +0000
    83   date:        Thu Jan 01 00:00:00 1970 +0000
    82   summary:     0
    84   summary:     1
       
    85   
    83   
    86   $ hg help revsets | grep 'bookmark('
    84   $ hg help revsets | grep 'bookmark('
    87       "bookmark([name])"
    85       "bookmark([name])"
    88 
    86 
    89 bookmarks X and X2 moved to rev 1, Y at rev -1
    87 bookmarks X and X2 moved to rev 1, Y at rev -1
    90 
    88 
    91   $ hg bookmarks
    89   $ hg bookmarks
    92    * X                         1:925d80f479bb
    90      X                         0:f7b1eb17ad24
    93    * X2                        1:925d80f479bb
    91      X2                        0:f7b1eb17ad24
    94      Y                         -1:000000000000
    92      Y                         -1:000000000000
    95 
    93 
    96 bookmark rev 0 again
    94 bookmark rev 0 again
    97 
    95 
    98   $ hg bookmark -r 0 Z
    96   $ hg bookmark -r 0 Z
    99 
    97 
       
    98   $ hg update X
       
    99   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   100   $ echo c > c
   100   $ echo c > c
   101   $ hg add c
   101   $ hg add c
   102   $ hg commit -m 2
   102   $ hg commit -m 2
   103 
   103   created new head
   104 bookmarks X and X2 moved to rev 2, Y at rev -1, Z at rev 0
   104 
   105 
   105 bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
   106   $ hg bookmarks
   106 
   107    * X                         2:0316ce92851d
   107   $ hg bookmarks
   108    * X2                        2:0316ce92851d
   108    * X                         2:db815d6d32e6
       
   109      X2                        0:f7b1eb17ad24
   109      Y                         -1:000000000000
   110      Y                         -1:000000000000
   110      Z                         0:f7b1eb17ad24
   111      Z                         0:f7b1eb17ad24
   111 
   112 
   112 rename nonexistent bookmark
   113 rename nonexistent bookmark
   113 
   114 
   126   $ hg bookmark -f -m X Y
   127   $ hg bookmark -f -m X Y
   127 
   128 
   128 list bookmarks
   129 list bookmarks
   129 
   130 
   130   $ hg bookmark
   131   $ hg bookmark
   131    * X2                        2:0316ce92851d
   132      X2                        0:f7b1eb17ad24
   132    * Y                         2:0316ce92851d
   133    * Y                         2:db815d6d32e6
   133      Z                         0:f7b1eb17ad24
   134      Z                         0:f7b1eb17ad24
   134 
   135 
   135 rename without new name
   136 rename without new name
   136 
   137 
   137   $ hg bookmark -m Y
   138   $ hg bookmark -m Y
   155   $ hg bookmark ' x  y '
   156   $ hg bookmark ' x  y '
   156 
   157 
   157 list bookmarks
   158 list bookmarks
   158 
   159 
   159   $ hg bookmarks
   160   $ hg bookmarks
   160    * X2                        2:0316ce92851d
   161      X2                        0:f7b1eb17ad24
   161    * Y                         2:0316ce92851d
   162      Y                         2:db815d6d32e6
   162      Z                         0:f7b1eb17ad24
   163      Z                         0:f7b1eb17ad24
   163    * x  y                      2:0316ce92851d
   164    * x  y                      2:db815d6d32e6
   164 
   165 
   165 look up stripped bookmark name
   166 look up stripped bookmark name
   166 
   167 
   167   $ hg log -r '"x  y"'
   168   $ hg log -r '"x  y"'
   168   changeset:   2:0316ce92851d
   169   changeset:   2:db815d6d32e6
   169   bookmark:    X2
       
   170   bookmark:    Y
   170   bookmark:    Y
   171   bookmark:    x  y
   171   bookmark:    x  y
   172   tag:         tip
   172   tag:         tip
       
   173   parent:      0:f7b1eb17ad24
   173   user:        test
   174   user:        test
   174   date:        Thu Jan 01 00:00:00 1970 +0000
   175   date:        Thu Jan 01 00:00:00 1970 +0000
   175   summary:     2
   176   summary:     2
   176   
   177   
   177 
   178 
   193   $ hg bookmark -f Z
   194   $ hg bookmark -f Z
   194 
   195 
   195 list bookmarks
   196 list bookmarks
   196 
   197 
   197   $ hg bookmark
   198   $ hg bookmark
   198    * X2                        2:0316ce92851d
   199      X2                        0:f7b1eb17ad24
   199    * Y                         2:0316ce92851d
   200      Y                         2:db815d6d32e6
   200    * Z                         2:0316ce92851d
   201    * Z                         2:db815d6d32e6
   201    * x  y                      2:0316ce92851d
   202      x  y                      2:db815d6d32e6
   202 
   203 
   203 revision but no bookmark name
   204 revision but no bookmark name
   204 
   205 
   205   $ hg bookmark -r .
   206   $ hg bookmark -r .
   206   abort: bookmark name required
   207   abort: bookmark name required