tests/test-bookmarks.t
author David Soria Parra <dsp@php.net>
Sun, 20 Feb 2011 00:57:55 +0100
branchstable
changeset 13448 97b69883e929
parent 13425 0fe36c347c00
child 13454 afc84a879ac8
permissions -rw-r--r--
bookmarks: mark new bookmark as current if it points to the current dirstate hg bookmark -r ancestorrev X will not mark X as the current bookmark anymore. If you want to point a bookmark to a ancestor rev you will use hg update to move to it. This will set the current bookmark.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
     1
  $ echo "[extensions]" >> $HGRCPATH
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
     2
  $ echo "bookmarks=" >> $HGRCPATH
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
     3
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
     4
  $ hg init
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
     5
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
     6
no bookmarks
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
     7
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
     8
  $ hg bookmarks
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
     9
  no bookmarks set
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    10
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    11
bookmark rev -1
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    12
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    13
  $ hg bookmark X
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    14
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    15
list bookmarks
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    16
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    17
  $ hg bookmarks
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    18
   * X                         -1:000000000000
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    19
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    20
list bookmarks with color
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    21
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    22
  $ hg --config extensions.color= --config color.mode=ansi \
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    23
  >    bookmarks --color=always
12942
05fffd665170 tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12822
diff changeset
    24
  \x1b[0;32m * X                         -1:000000000000\x1b[0m (esc)
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    25
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    26
  $ echo a > a
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    27
  $ hg add a
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    28
  $ hg commit -m 0
10826
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 7261
diff changeset
    29
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    30
bookmark X moved to rev 0
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    31
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    32
  $ hg bookmarks
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    33
   * X                         0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    34
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    35
look up bookmark
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    36
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    37
  $ hg log -r X
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    38
  changeset:   0:f7b1eb17ad24
13386
f78bc5ddbe4f templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents: 13385
diff changeset
    39
  bookmark:    X
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    40
  tag:         tip
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    41
  user:        test
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    42
  date:        Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    43
  summary:     0
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    44
  
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    45
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    46
second bookmark for rev 0
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    47
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    48
  $ hg bookmark X2
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    49
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    50
bookmark rev -1 again
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    51
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    52
  $ hg bookmark -r null Y
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    53
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    54
list bookmarks
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    55
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    56
  $ hg bookmarks
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
    57
     X                         0:f7b1eb17ad24
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    58
   * X2                        0:f7b1eb17ad24
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    59
     Y                         -1:000000000000
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    60
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    61
  $ echo b > b
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    62
  $ hg add b
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    63
  $ hg commit -m 1
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    64
12714
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    65
bookmarks revset
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    66
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    67
  $ hg log -r 'bookmark()'
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
    68
  changeset:   0:f7b1eb17ad24
13386
f78bc5ddbe4f templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents: 13385
diff changeset
    69
  bookmark:    X
12714
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    70
  user:        test
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    71
  date:        Thu Jan 01 00:00:00 1970 +0000
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
    72
  summary:     0
12714
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    73
  
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    74
  changeset:   1:925d80f479bb
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    75
  bookmark:    X2
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    76
  tag:         tip
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    77
  user:        test
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    78
  date:        Thu Jan 01 00:00:00 1970 +0000
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    79
  summary:     1
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    80
  
12714
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    81
  $ hg log -r 'bookmark(Y)'
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    82
  $ hg log -r 'bookmark(X2)'
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    83
  changeset:   1:925d80f479bb
13386
f78bc5ddbe4f templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents: 13385
diff changeset
    84
  bookmark:    X2
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    85
  tag:         tip
12714
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    86
  user:        test
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    87
  date:        Thu Jan 01 00:00:00 1970 +0000
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    88
  summary:     1
12714
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    89
  
12822
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents: 12714
diff changeset
    90
  $ hg help revsets | grep 'bookmark('
f13acb96b2a7 Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents: 12714
diff changeset
    91
      "bookmark([name])"
12714
f5178fbcd197 bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents: 12346
diff changeset
    92
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    93
bookmarks X and X2 moved to rev 1, Y at rev -1
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
    94
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    95
  $ hg bookmarks
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
    96
     X                         0:f7b1eb17ad24
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
    97
   * X2                        1:925d80f479bb
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    98
     Y                         -1:000000000000
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
    99
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   100
bookmark rev 0 again
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   101
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   102
  $ hg bookmark -r 0 Z
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   103
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   104
  $ hg update X
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   105
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   106
  $ echo c > c
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   107
  $ hg add c
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   108
  $ hg commit -m 2
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   109
  created new head
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   110
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   111
bookmarks X moved to rev 2, Y at rev -1, Z at rev 0
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   112
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   113
  $ hg bookmarks
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   114
   * X                         2:db815d6d32e6
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
   115
     X2                        1:925d80f479bb
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13386
diff changeset
   116
     Y                         -1:000000000000
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   117
     Z                         0:f7b1eb17ad24
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   118
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   119
rename nonexistent bookmark
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   120
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   121
  $ hg bookmark -m A B
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   122
  abort: a bookmark of this name does not exist
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   123
  [255]
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   124
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   125
rename to existent bookmark
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   126
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   127
  $ hg bookmark -m X Y
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   128
  abort: a bookmark of the same name already exists
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   129
  [255]
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   130
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   131
force rename to existent bookmark
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   132
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   133
  $ hg bookmark -f -m X Y
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   134
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   135
list bookmarks
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   136
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   137
  $ hg bookmark
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
   138
     X2                        1:925d80f479bb
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   139
   * Y                         2:db815d6d32e6
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   140
     Z                         0:f7b1eb17ad24
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   141
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   142
rename without new name
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   143
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   144
  $ hg bookmark -m Y
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   145
  abort: new bookmark name required
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   146
  [255]
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   147
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   148
delete without name
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   149
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   150
  $ hg bookmark -d
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   151
  abort: bookmark name required
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   152
  [255]
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   153
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   154
delete nonexistent bookmark
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   155
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   156
  $ hg bookmark -d A
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   157
  abort: a bookmark of this name does not exist
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   158
  [255]
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   159
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   160
bookmark name with spaces should be stripped
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   161
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   162
  $ hg bookmark ' x  y '
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   163
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   164
list bookmarks
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   165
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   166
  $ hg bookmarks
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
   167
     X2                        1:925d80f479bb
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   168
     Y                         2:db815d6d32e6
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   169
     Z                         0:f7b1eb17ad24
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   170
   * x  y                      2:db815d6d32e6
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   171
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   172
look up stripped bookmark name
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   173
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   174
  $ hg log -r '"x  y"'
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   175
  changeset:   2:db815d6d32e6
13386
f78bc5ddbe4f templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents: 13385
diff changeset
   176
  bookmark:    Y
f78bc5ddbe4f templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents: 13385
diff changeset
   177
  bookmark:    x  y
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   178
  tag:         tip
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   179
  parent:      0:f7b1eb17ad24
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   180
  user:        test
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   181
  date:        Thu Jan 01 00:00:00 1970 +0000
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   182
  summary:     2
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   183
  
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   184
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   185
reject bookmark name with newline
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   186
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   187
  $ hg bookmark '
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   188
  > '
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   189
  abort: bookmark name cannot contain newlines
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   190
  [255]
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   191
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   192
bookmark with existing name
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   193
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   194
  $ hg bookmark Z
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   195
  abort: a bookmark of the same name already exists
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   196
  [255]
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   197
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   198
force bookmark with existing name
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   199
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   200
  $ hg bookmark -f Z
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   201
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   202
list bookmarks
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   203
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   204
  $ hg bookmark
13448
97b69883e929 bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents: 13425
diff changeset
   205
     X2                        1:925d80f479bb
13416
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   206
     Y                         2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   207
   * Z                         2:db815d6d32e6
5431b3f3e52e bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents: 13388
diff changeset
   208
     x  y                      2:db815d6d32e6
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   209
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   210
revision but no bookmark name
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   211
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   212
  $ hg bookmark -r .
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   213
  abort: bookmark name required
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   214
  [255]
7261
4ba89b6d0e05 bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   215
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   216
bookmark name with whitespace only
11704
18c47562d331 bookmarks: don't allow name to contain whitespaces only
Idan Kamara <idankk86@gmail.com>
parents: 11282
diff changeset
   217
11861
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   218
  $ hg bookmark ' '
41d481ddd976 tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents: 11704
diff changeset
   219
  abort: bookmark names cannot consist entirely of whitespace
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 11861
diff changeset
   220
  [255]
13425
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents: 13416
diff changeset
   221
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents: 13416
diff changeset
   222
invalid bookmark
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents: 13416
diff changeset
   223
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents: 13416
diff changeset
   224
  $ hg bookmark 'foo:bar'
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents: 13416
diff changeset
   225
  abort: bookmark 'foo:bar' contains illegal character
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents: 13416
diff changeset
   226
  [255]
0fe36c347c00 bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents: 13416
diff changeset
   227