##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

split: new extension to split changesets...
split: new extension to split changesets This diff introduces an experimental split extension to split changesets. The implementation is largely inspired by Laurent Charignon's implementation for mutable-history (changeset 9603aa1ecdfd54b0d86e262318a72e0a2ffeb6cc [1]) This version contains various improvements: - Rebase by default. This is more friendly for new users. Split won't lead to merge conflicts so a rebase won't give the user more trouble. This has been on by default at Facebook for months now and seems to be a good UX improvement. The rebase skips obsoleted or orphaned changesets, which can avoid issues like allowdivergence, merge conflicts, etc. This is more flexible because the user can decide what to do next (see the last test case in test-split.t) - Remove "Done split? [y/n]" prompt. That could be detected by checking `repo.status()` instead. - Works with obsstore disabled. Without obsstore, split uses strip to clean up old nodes, and it can even handle split a non-head changeset with "allowunstable" disabled, since it runs a rebase to solve the "unstable" issue in a same transaction. - More friendly editor text. Put what has been already split into the editor text so users won't lost track about where they are. [1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b Differential Revision: https://phab.mercurial-scm.org/D1082
av6 - - Load All Authors

File last commit:

r35202:ec71518a default
r35471:02ea370c @7 default
Show More
style.css
120 lines | 2.7 KiB | text/css | CssLexer
/ mercurial / templates / static / style.css
History | Source | Raw |Copy content |Copy permalink
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 a { text-decoration:none; }
.age { white-space:nowrap; }
.date { white-space:nowrap; }
.indexlinks { white-space:nowrap; }
Gijs Kruitbosch
hgweb: ensure both foreground and background colors are specified (issue4872)...
 r26536 .parity0 { background-color: #ddd; color: #000; }
.parity1 { background-color: #eee; color: #000; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 .lineno { width: 60px; color: #aaa; font-size: smaller;
text-align: right; }
.plusline { color: green; }
.minusline { color: red; }
.atline { color: purple; }
.annotate { font-size: smaller; text-align: right; padding-right: 1em; }
Denis Laxalde
hgweb: highlight data of the current revision in annotate view...
 r29387 tr.thisrev a { color:#999999; text-decoration: none; }
tr.thisrev pre { color:#009900; }
Tooru Fujisawa
hgweb: avoid line wrap between revision and annotate-info (issue5398)...
 r30074 td.annotate {
white-space: nowrap;
}
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
 r29522 div.annotate-info {
display: none;
position: absolute;
background-color: #FFFFFF;
av6
spartan: make annotate popup use theme colors
 r29628 border: 1px solid #888;
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
 r29522 text-align: left;
color: #000000;
padding: 5px;
}
div.annotate-info a { color: #0000FF; }
td.annotate:hover div.annotate-info { display: inline; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 .buttons a {
background-color: #666;
padding: 2pt;
color: white;
Alexander Plavin
css: fixed font-family...
 r19075 font-family: sans-serif;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 font-weight: bold;
}
.navigate a {
background-color: #ccc;
padding: 2pt;
Alexander Plavin
css: fixed font-family...
 r19075 font-family: sans-serif;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 color: black;
}
.metatag {
background-color: #888;
color: white;
text-align: right;
}
/* Common */
pre { margin: 0; }
.logo {
float: right;
clear: right;
}
/* Changelog/Filelog entries */
.logEntry { width: 100%; }
.logEntry .age { width: 15%; }
FUJIWARA Katsunori
hgweb: align entries in "changelog" and "revisions" pages of "spartan" style...
 r21124 .logEntry th.label { width: 16em; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 .logEntry th { font-weight: normal; text-align: right; vertical-align: top; }
.logEntry th.age, .logEntry th.firstline { font-weight: bold; }
.logEntry th.firstline { text-align: left; width: inherit; }
/* Shortlog entries */
.slogEntry { width: 100%; }
.slogEntry .age { width: 8em; }
.slogEntry td { font-weight: normal; text-align: left; vertical-align: top; }
.slogEntry td.author { width: 15em; }
/* Tag entries */
#tagEntries { list-style: none; margin: 0; padding: 0; }
#tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; }
/* Changeset entry */
#changesetEntry { }
#changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
#changesetEntry th.files, #changesetEntry th.description { vertical-align: top; }
/* File diff view */
#filediffEntry { }
#filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
/* Graph */
div#wrapper {
position: relative;
margin: 0;
padding: 0;
}
canvas {
position: absolute;
z-index: 5;
top: -0.6em;
margin: 0;
}
ul#nodebgs {
list-style: none inside none;
padding: 0;
margin: 0;
top: -0.7em;
}
ul#graphnodes li, ul#nodebgs li {
height: 39px;
}
ul#graphnodes {
position: absolute;
z-index: 10;
top: -0.85em;
list-style: none inside none;
padding: 0;
}
ul#graphnodes li .info {
display: block;
font-size: 70%;
}