upstream/mercurial-mirror Files · templates/spartan/branches.tmpl

update: allow branch crossing without -c or -C, with no uncommitted changes...

update: allow branch crossing without -c or -C, with no uncommitted changes Update will now allow crossing branches within the same named branch, when given a specific revision, if the working dir is clean, without requiring the -c or -C option. Abort if no revision is given and this would cross branches. Minor change to abort message if uncommitted changes are found. Modify test-update-branches and output to reflect the altered case. Modify test-merge5.out to reflect the altered case. Modify test-up-local-change.out with new message.

Dirkjan Ochtman - - Load All Authors

File last commit:

r8431:5c1aabc5 default


                r9717:68a1b9d0

default

Download file

             branches.tmpl
        
                    26 lines
            
             | 855 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / templates / spartan / branches.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dirkjan Ochtman
    
spartan: use newer template syntax everywhere

              r8431
            
      {header}

      <title>{repo|escape}: branches</title>

        Sune Foldager
    
spartan: add branches page

              r8357
            
      <link rel="alternate" type="application/atom+xml"

        Dirkjan Ochtman
    
spartan: use newer template syntax everywhere

              r8431
            
         href="{url}atom-branches" title="Atom feed for {repo|escape}: branches">

        Sune Foldager
    
spartan: add branches page

              r8357
            
      <link rel="alternate" type="application/rss+xml"

        Dirkjan Ochtman
    
spartan: use newer template syntax everywhere

              r8431
            
         href="{url}rss-branches" title="RSS feed for {repo|escape}: branches">

        Sune Foldager
    
spartan: add branches page

              r8357
            
      </head>

      <body>

      <div class="buttons">

        Dirkjan Ochtman
    
spartan: use newer template syntax everywhere

              r8431
            
      <a href="{url}log{sessionvars%urlparameter}">changelog</a>

      <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a>

      <a href="{url}graph{sessionvars%urlparameter}">graph</a>

      <a href="{url}tags{sessionvars%urlparameter}">tags</a>

      <a href="{url}file/{node|short}/{sessionvars%urlparameter}">files</a>

      <a type="application/rss+xml" href="{url}rss-branches">rss</a>

      <a type="application/atom+xml" href="{url}atom-branches">atom</a>

        Sune Foldager
    
spartan: add branches page

              r8357
            
      </div>

      <h2>branches:</h2>

      <ul id="tagEntries">

        Dirkjan Ochtman
    
spartan: use newer template syntax everywhere

              r8431
            
      {entries%branchentry}

        Sune Foldager
    
spartan: add branches page

              r8357
            
      </ul>

        Dirkjan Ochtman
    
spartan: use newer template syntax everywhere

              r8431
            
      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Dirkjan Ochtman spartan: use newer template syntax everywhere	r8431	{header}
		<title>{repo\|escape}: branches</title>
Sune Foldager spartan: add branches page	r8357	<link rel="alternate" type="application/atom+xml"
Dirkjan Ochtman spartan: use newer template syntax everywhere	r8431	href="{url}atom-branches" title="Atom feed for {repo\|escape}: branches">
Sune Foldager spartan: add branches page	r8357	<link rel="alternate" type="application/rss+xml"
Dirkjan Ochtman spartan: use newer template syntax everywhere	r8431	href="{url}rss-branches" title="RSS feed for {repo\|escape}: branches">
Sune Foldager spartan: add branches page	r8357	</head>
		<body>

		<div class="buttons">
Dirkjan Ochtman spartan: use newer template syntax everywhere	r8431	<a href="{url}log{sessionvars%urlparameter}">changelog</a>
		<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a>
		<a href="{url}graph{sessionvars%urlparameter}">graph</a>
		<a href="{url}tags{sessionvars%urlparameter}">tags</a>
		<a href="{url}file/{node\|short}/{sessionvars%urlparameter}">files</a>
		<a type="application/rss+xml" href="{url}rss-branches">rss</a>
		<a type="application/atom+xml" href="{url}atom-branches">atom</a>
Sune Foldager spartan: add branches page	r8357	</div>

		<h2>branches:</h2>

		<ul id="tagEntries">
Dirkjan Ochtman spartan: use newer template syntax everywhere	r8431	{entries%branchentry}
Sune Foldager spartan: add branches page	r8357	</ul>

Dirkjan Ochtman spartan: use newer template syntax everywhere	r8431	{footer}