##// END OF EJS Templates
templatekw: replace currentbookmark with activebookmark keyword...
Ryan McElroy -
r25014:7e5d5160 default
parent child Browse files
Show More
@@ -376,8 +376,8 b' one shown by default::'
376 HG: --
376 HG: --
377 HG: user: {author}\n{ifeq(p2rev, "-1", "",
377 HG: user: {author}\n{ifeq(p2rev, "-1", "",
378 "HG: branch merge\n")
378 "HG: branch merge\n")
379 }HG: branch '{branch}'\n{if(currentbookmark,
379 }HG: branch '{branch}'\n{if(activebookmark,
380 "HG: bookmark '{currentbookmark}'\n") }{subrepos %
380 "HG: bookmark '{activebookmark}'\n") }{subrepos %
381 "HG: subrepo {subrepo}\n" }{file_adds %
381 "HG: subrepo {subrepo}\n" }{file_adds %
382 "HG: added {file}\n" }{file_mods %
382 "HG: added {file}\n" }{file_mods %
383 "HG: changed {file}\n" }{file_dels %
383 "HG: changed {file}\n" }{file_dels %
@@ -3090,12 +3090,12 b' Test current bookmark templating'
3090 2 bar* foo
3090 2 bar* foo
3091 1
3091 1
3092 0
3092 0
3093 $ hg log --template "{rev} {currentbookmark}\n"
3093 $ hg log --template "{rev} {activebookmark}\n"
3094 2 bar
3094 2 bar
3095 1
3095 1
3096 0
3096 0
3097 $ hg bookmarks --inactive bar
3097 $ hg bookmarks --inactive bar
3098 $ hg log --template "{rev} {currentbookmark}\n"
3098 $ hg log --template "{rev} {activebookmark}\n"
3099 2
3099 2
3100 1
3100 1
3101 0
3101 0
@@ -302,7 +302,7 b' test commit message content'
302 $ cd commitmsg
302 $ cd commitmsg
303 $ echo changed > changed
303 $ echo changed > changed
304 $ echo removed > removed
304 $ echo removed > removed
305 $ hg book currentbookmark
305 $ hg book activebookmark
306 $ hg ci -qAm init
306 $ hg ci -qAm init
307
307
308 $ hg rm removed
308 $ hg rm removed
@@ -317,7 +317,7 b' test commit message content'
317 HG: --
317 HG: --
318 HG: user: test
318 HG: user: test
319 HG: branch 'default'
319 HG: branch 'default'
320 HG: bookmark 'currentbookmark'
320 HG: bookmark 'activebookmark'
321 HG: added added
321 HG: added added
322 HG: changed changed
322 HG: changed changed
323 HG: removed removed
323 HG: removed removed
@@ -354,7 +354,7 b' test saving last-message.txt'
354 HG: --
354 HG: --
355 HG: user: test
355 HG: user: test
356 HG: branch 'default'
356 HG: branch 'default'
357 HG: bookmark 'currentbookmark'
357 HG: bookmark 'activebookmark'
358 HG: subrepo sub
358 HG: subrepo sub
359 HG: added .hgsub
359 HG: added .hgsub
360 HG: added added
360 HG: added added
@@ -376,22 +376,22 b' specific template keywords work well'
376 > [committemplate]
376 > [committemplate]
377 > changeset.commit.normal = HG: this is "commit.normal" template
377 > changeset.commit.normal = HG: this is "commit.normal" template
378 > HG: {extramsg}
378 > HG: {extramsg}
379 > {if(currentbookmark,
379 > {if(activebookmark,
380 > "HG: bookmark '{currentbookmark}' is activated\n",
380 > "HG: bookmark '{activebookmark}' is activated\n",
381 > "HG: no bookmark is activated\n")}{subrepos %
381 > "HG: no bookmark is activated\n")}{subrepos %
382 > "HG: subrepo '{subrepo}' is changed\n"}
382 > "HG: subrepo '{subrepo}' is changed\n"}
383 >
383 >
384 > changeset.commit = HG: this is "commit" template
384 > changeset.commit = HG: this is "commit" template
385 > HG: {extramsg}
385 > HG: {extramsg}
386 > {if(currentbookmark,
386 > {if(activebookmark,
387 > "HG: bookmark '{currentbookmark}' is activated\n",
387 > "HG: bookmark '{activebookmark}' is activated\n",
388 > "HG: no bookmark is activated\n")}{subrepos %
388 > "HG: no bookmark is activated\n")}{subrepos %
389 > "HG: subrepo '{subrepo}' is changed\n"}
389 > "HG: subrepo '{subrepo}' is changed\n"}
390 >
390 >
391 > changeset = HG: this is customized commit template
391 > changeset = HG: this is customized commit template
392 > HG: {extramsg}
392 > HG: {extramsg}
393 > {if(currentbookmark,
393 > {if(activebookmark,
394 > "HG: bookmark '{currentbookmark}' is activated\n",
394 > "HG: bookmark '{activebookmark}' is activated\n",
395 > "HG: no bookmark is activated\n")}{subrepos %
395 > "HG: no bookmark is activated\n")}{subrepos %
396 > "HG: subrepo '{subrepo}' is changed\n"}
396 > "HG: subrepo '{subrepo}' is changed\n"}
397 > EOF
397 > EOF
@@ -404,7 +404,7 b' specific template keywords work well'
404 $ HGEDITOR=cat hg commit -S -q
404 $ HGEDITOR=cat hg commit -S -q
405 HG: this is "commit.normal" template
405 HG: this is "commit.normal" template
406 HG: Leave message empty to abort commit.
406 HG: Leave message empty to abort commit.
407 HG: bookmark 'currentbookmark' is activated
407 HG: bookmark 'activebookmark' is activated
408 HG: subrepo 'sub' is changed
408 HG: subrepo 'sub' is changed
409 HG: subrepo 'sub2' is changed
409 HG: subrepo 'sub2' is changed
410 abort: empty commit message
410 abort: empty commit message
@@ -416,7 +416,7 b' specific template keywords work well'
416 > # now, "changeset.commit" should be chosen for "hg commit"
416 > # now, "changeset.commit" should be chosen for "hg commit"
417 > EOF
417 > EOF
418
418
419 $ hg bookmark --inactive currentbookmark
419 $ hg bookmark --inactive activebookmark
420 $ hg forget .hgsub
420 $ hg forget .hgsub
421 $ HGEDITOR=cat hg commit -q
421 $ HGEDITOR=cat hg commit -q
422 HG: this is "commit" template
422 HG: this is "commit" template
General Comments 0
You need to be logged in to leave comments. Login now