kallithea Changeset - 3c713e810e61

Changeset - 3c713e810e61

Parent rev.

Child rev.

[Not reviewed]

rhodecode-2.2.5-gpl

0 3 0

Mads Kiilerich - 11 years ago 2014-07-03 01:03:23
madski@unity3d.com

old style: fix width of new changelog "expand" column

3 files changed with 8 insertions and 2 deletions:

rhodecode/public/css/style.css

rhodecode/templates/compare/compare_cs.html

rhodecode/tests/functional/test_compare.py

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1813,1536 +1813,1542 @@ div.form div.fields div.field div.button @@
+}
 .metatag[tag="recommends"] {
     background-color: #BDF;
+}
 .metatag[tag="lang"] {
     background-color: #FAF474;
+}
 .metatag[tag="license"] {
     border: solid 1px #9CF;
     background-color: #DEF;
     target-new: tab !important;
+}
 .metatag[tag="see"] {
     border: solid 1px #CBD;
     background-color: #EDF;
+}
 a.metatag[tag="license"]:hover {
     background-color: #003367;
     color: #FFF;
     text-decoration: none;
+}
 #summary .desc {
     white-space: pre;
     width: 100%;
+}
 #summary .repo_name {
     font-size: 1.6em;
     font-weight: bold;
     vertical-align: baseline;
     clear: right
+}
 #footer {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 0 10px 4px;
     margin: -10px 0 0;
+}
 #footer div#footer-inner {
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient( linear, left top, left bottom, from(#003B76), to(#00376E));
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient( top, #003b76, #00376e);
     background-image: -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e));
     background-image: -webkit-linear-gradient( top, #003b76, #00376e));
     background-image: -o-linear-gradient( top, #003b76, #00376e));
     background-image: linear-gradient(to bottom, #003b76, #00376e);
     filter: progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#003b76', endColorstr = '#00376e', GradientType = 0);
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
+}
 #footer div#footer-inner p {
     padding: 15px 25px 15px 0;
     color: #FFF;
     font-weight: 700;
+}
 #footer div#footer-inner .footer-link {
     float: left;
     padding-left: 10px;
+}
 #footer div#footer-inner .footer-link a, #footer div#footer-inner .footer-link-right a {
     color: #FFF;
+}
 #login div.title {
     clear: both;
     overflow: hidden;
     position: relative;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient( linear, left top, left bottom, from(#003B76), to(#00376E));
     background-image: -moz-linear-gradient( top, #003b76, #00376e);
     background-image: -ms-linear-gradient( top, #003b76, #00376e);
     background-image: -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #003b76), color-stop( 100%, #00376e));
     background-image: -webkit-linear-gradient( top, #003b76, #00376e));
     background-image: -o-linear-gradient( top, #003b76, #00376e));
     background-image: linear-gradient(to bottom, #003b76, #00376e);
     filter: progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#003b76', endColorstr = '#00376e', GradientType = 0);
     margin: 0 auto;
     padding: 0;
+}
 #login div.inner {
     background: #FFF url("../images/login.png") no-repeat top left;
     border-top: none;
     border-bottom: none;
     margin: 0 auto;
     padding: 20px;
+}
 #login div.form div.fields div.field div.label {
     width: 173px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
 #login div.form div.fields div.field div.input input {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #login div.form div.fields div.buttons {
     clear: both;
     overflow: hidden;
     border-top: 1px solid #DDD;
     text-align: right;
     margin: 0;
     padding: 10px 0 0;
+}
 #login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 .user-menu {
     margin: 0px !important;
     float: left;
+}
 .user-menu .container {
     padding: 0px 4px 0px 4px;
     margin: 0px 0px 0px 0px;
+}
 .user-menu .gravatar {
     margin: 0px 0px 0px 0px;
     cursor: pointer;
+}
 .user-menu .gravatar.enabled {
     background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover {
     background-color: #FDF784 !important;
+}
 #quick_login {
     min-height: 110px;
     padding: 4px;
     position: absolute;
     right: 0;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#003B76), to(#00376E) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76), color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e);
     background-image: -o-linear-gradient(top, #003b76, #00376e);
     background-image: linear-gradient(to bottom, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76', endColorstr='#00376e', GradientType=0 );
     z-index: 999;
     -webkit-border-radius: 0px 0px 4px 4px;
     -khtml-border-radius: 0px 0px 4px 4px;
     border-radius: 0px 0px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     overflow: hidden;
+}
 #quick_login h4 {
     color: #fff;
     padding: 5px 0px 5px 14px;
+}
 #quick_login .password_forgoten {
     padding-right: 0px;
     padding-top: 0px;
     text-align: left;
+}
 #quick_login .password_forgoten a {
     font-size: 10px;
     color: #fff;
     padding: 0px !important;
     line-height: 20px !important;
+}
 #quick_login .register {
     padding-right: 10px;
     padding-top: 5px;
     text-align: left;
+}
 #quick_login .register a {
     font-size: 10px;
     color: #fff;
     padding: 0px !important;
     line-height: 20px !important;
+}
 #quick_login .submit {
     margin: -20px 0 0 0px;
     position: absolute;
     right: 15px;
+}
 #quick_login .links_left {
     float: left;
     margin-right: 130px;
     width: 170px;
+}
 #quick_login .links_right {
     position: absolute;
     right: 0;
+}
 #quick_login .full_name {
     color: #FFFFFF;
     font-weight: bold;
     padding: 3px 3px 3px 6px;
+}
 #quick_login .big_gravatar {
     padding: 4px 0px 0px 6px;
+}
 #quick_login .notifications {
     padding: 2px 0px 0px 6px;
     color: #FFFFFF;
     font-weight: bold;
     line-height: 10px !important;
+}
 #quick_login .notifications a,
 #quick_login .unread a {
     color: #FFFFFF;
     display: block;
     padding: 0px !important;
+}
 #quick_login .notifications a:hover,
 #quick_login .unread a:hover {
     background-color: inherit !important;
+}
 #quick_login .email, #quick_login .unread {
     color: #FFFFFF;
     padding: 3px 3px 3px 6px;
+}
 #quick_login .links .logout {
+}
 #quick_login div.form div.fields {
     padding-top: 2px;
     padding-left: 10px;
+}
 #quick_login div.form div.fields div.field {
     padding: 5px;
+}
 #quick_login div.form div.fields div.field div.label label {
     color: #fff;
     padding-bottom: 3px;
+}
 #quick_login div.form div.fields div.field div.input input {
     width: 236px;
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 5px 7px 4px;
+}
 #quick_login div.form div.fields div.buttons {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 5px 14px 0px 5px;
+}
 #quick_login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 #quick_login ol.links {
     display: block;
     font-weight: bold;
     list-style: none outside none;
     text-align: right;
+}
 #quick_login ol.links li {
     line-height: 27px;
     margin: 0;
     padding: 0;
     color: #fff;
     display: block;
     float: none !important;
+}
 #quick_login ol.links li a {
     color: #fff;
     display: block;
     padding: 2px;
+}
 #quick_login ol.links li a:HOVER {
     background-color: inherit !important;
+}
 #register div.title {
     clear: both;
     overflow: hidden;
     position: relative;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#003B76), to(#00376E) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76), color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e);
     background-image: -o-linear-gradient(top, #003b76, #00376e);
     background-image: linear-gradient(to bottom, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
         endColorstr='#00376e', GradientType=0 );
     margin: 0 auto;
     padding: 0;
+}
 #register div.inner {
     background: #FFF;
     border-top: none;
     border-bottom: none;
     margin: 0 auto;
     padding: 20px;
+}
 #register div.form div.fields div.field div.label {
     width: 135px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
 #register div.form div.fields div.field div.input input {
     width: 300px;
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #register div.form div.fields div.buttons {
     clear: both;
     overflow: hidden;
     border-top: 1px solid #DDD;
     text-align: left;
     margin: 0;
     padding: 10px 0 0 150px;
+}
 #register div.form div.activation_msg {
     padding-top: 4px;
     padding-bottom: 4px;
+}
 #journal .journal_day {
     font-size: 20px;
     padding: 10px 0px;
     border-bottom: 2px solid #DDD;
     margin-left: 10px;
     margin-right: 10px;
+}
 #journal .journal_container {
     padding: 5px;
     clear: both;
     margin: 0px 5px 0px 10px;
+}
 #journal .journal_action_container {
     padding-left: 38px;
+}
 #journal .journal_user {
     color: #747474;
     font-size: 14px;
     font-weight: bold;
     height: 30px;
+}
 #journal .journal_user.deleted {
     color: #747474;
     font-size: 14px;
     font-weight: normal;
     height: 30px;
     font-style: italic;
+}
 #journal .journal_icon {
     clear: both;
     float: left;
     padding-right: 4px;
     padding-top: 3px;
+}
 #journal .journal_action {
     padding-top: 4px;
     min-height: 2px;
     float: left
+}
 #journal .journal_action_params {
     clear: left;
     padding-left: 22px;
+}
 #journal .journal_repo {
     float: left;
     margin-left: 6px;
     padding-top: 3px;
+}
 #journal .date {
     clear: both;
     color: #777777;
     font-size: 11px;
     padding-left: 22px;
+}
 #journal .journal_repo .journal_repo_name {
     font-weight: bold;
     font-size: 1.1em;
+}
 #journal .compare_view {
     padding: 5px 0px 5px 0px;
     width: 95px;
+}
 .journal_highlight {
     font-weight: bold;
     padding: 0 2px;
     vertical-align: bottom;
+}
 .trending_language_tbl, .trending_language_tbl td {
     border: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
+}
 .trending_language_tbl, .trending_language_tbl tr {
     border-spacing: 1px;
+}
 .trending_language {
     background-color: #003367;
     color: #FFF;
     display: block;
     min-width: 20px;
     text-decoration: none;
     height: 12px;
     margin-bottom: 0px;
     margin-left: 5px;
     white-space: pre;
     padding: 3px;
+}
 h3.files_location {
     font-size: 1.8em;
     font-weight: 700;
     border-bottom: none !important;
     margin: 10px 0 !important;
+}
 #files_data dl dt {
     float: left;
     width: 60px;
     margin: 0 !important;
     padding: 5px;
+}
 #files_data dl dd {
     margin: 0 !important;
     padding: 5px !important;
+}
 #files_data .codeblock #editor_container .error-message {
     color: red;
     padding: 10px 10px 10px 26px
+}
 .file_history {
     padding-top: 10px;
     font-size: 16px;
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float: left;
     padding: 5px;
     color: #888;
+}
 .tablerow0 {
     background-color: #F8F8F8;
+}
 .tablerow1 {
     background-color: #FFFFFF;
+}
 .changeset_id {
     color: #666666;
     margin-right: -3px;
+}
 .changeset_hash {
     color: #000000;
+}
 #changeset_content {
     border-left: 1px solid #CCC;
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_compare_view_content {
     border: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .container {
     min-height: 100px;
     font-size: 1.2em;
     overflow: hidden;
+}
 #changeset_compare_view_content .compare_view_commits {
     width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
     padding: 0px 0px 0px 12px !important;
+}
 #changeset_content .container .right {
     float: right;
     width: 20%;
     text-align: right;
+}
 #changeset_content .container .message {
     white-space: pre-wrap;
+}
 #changeset_content .container .message a:hover {
     text-decoration: none;
+}
 .cs_files .cur_cs {
     margin: 10px 2px;
     font-weight: bold;
+}
 .cs_files .node {
     float: left;
+}
 .cs_files .changes {
     float: right;
     color: #003367;
+}
 .cs_files .changes .added {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .deleted {
     background-color: #FF8888;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*new binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 CHMOD_FILENODE = 5
 BIN_FILENODE = 6
 */
 .cs_files .changes .bin {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .bin.bin1 {
     background-color: #BBFFBB;
+}
 /*deleted binary*/
 .cs_files .changes .bin.bin2 {
     background-color: #FF8888;
+}
 /*mod binary*/
 .cs_files .changes .bin.bin3 {
     background-color: #DDDDDD;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*chmod file*/
 .cs_files .changes .bin.bin5 {
     background-color: #6D99FF;
+}
 .cs_files .cs_added, .cs_files .cs_A {
     background: url("../images/icons/page_white_add.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_changed, .cs_files .cs_M {
     background: url("../images/icons/page_white_edit.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_removed, .cs_files .cs_D {
     background: url("../images/icons/page_white_delete.png") no-repeat
         scroll 3px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .table {
     position: relative;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     position: absolute;
+}
 #graph_content,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
     position: relative;
+}
 #graph .container_header {
     padding: 10px;
     height: 25px;
+}
 #graph_content #rev_range_container {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #rev_range_clear {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
     table-layout: fixed;
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
     text-align: left;
+}
 #graph_content .container .checkbox {
     width: 12px;
     font-size: 0.85em;
+}
 #graph_content .container .status {
     width: 14px;
     font-size: 0.85em;
+}
 #graph_content .container .author {
    width: 105px;
+}
 #graph_content .container .hash {
     width: 100px;
     font-size: 0.85em;
+}
 #graph_content #changesets .container .date {
     width: 76px;
     color: #666;
     font-size: 10px;
+}
 #graph_content_pr .compare_view_commits .expand_commit,
 #graph_content .container .expand_commit {
     width: 24px;
     cursor: pointer;
+}
 #graph_content #changesets .container .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;
     position: relative;
+}
 #graph_content .container .mid {
     padding: 0;
+}
 #graph_content .log-container {
     position: relative;
+}
 #graph_content .container .changeset_range {
     float: left;
     margin: 6px 3px;
+}
 #graph_content .container .author img {
     vertical-align: middle;
+}
 #graph_content .container .author .user {
     color: #444444;
+}
 #graph_content .container .mid .message {
     white-space: pre-wrap;
     padding: 0;
     overflow: hidden;
     height: 1.1em;
+}
 #graph_content .container .extra-container {
     display: block;
     position: absolute;
     top: -15px;
     right: 0;
     padding-left: 5px;
     background: #FFFFFF;
     height: 41px;
+}
 #graph_content .comments-container,
 #shortlog_data .comments-container,
 #graph_content .logtags {
     display: block;
     float: left;
     overflow: hidden;
     padding: 0;
     margin: 0;
+}
 #graph_content .comments-container {
     margin: 0.8em 0;
     margin-right: 0.5em;
+}
 #graph_content  .tagcontainer {
     width: 80px;
     position: relative;
     float: right;
     height: 100%;
     top: 7px;
     margin-left: 0.5em;
+}
 #graph_content .logtags {
     min-width: 80px;
     height: 1.1em;
     position: absolute;
     left: 0px;
     width: auto;
     top: 0px;
+}
 #graph_content .logtags.tags {
     top: 14px;
+}
 #graph_content .logtags:hover {
     overflow: visible;
     position: absolute;
     width: auto;
     right: 0;
     left: initial;
+}
 #graph_content .logtags .booktag,
 #graph_content .logtags .tagtag {
     float: left;
     line-height: 1em;
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
+}
 #graph_content .container .mid .message a:hover {
     text-decoration: none;
+}
 .revision-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .issue-tracker-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .changeset-status-container {
     padding-right: 5px;
     margin-top: 1px;
     float: right;
     height: 14px;
+}
 .code-header .changeset-status-container {
     float: left;
     padding: 2px 0px 0px 2px;
+}
 .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 3px 4px 0px 0px
+}
 .code-header .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .changeset-status-container .changeset-status-ico {
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico, .container .changeset-status-ico {
     float: left;
+}
 #graph_content .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 5px 0;
+}
 #shortlog_data .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 3px 0;
+}
 #graph_content .comments-cnt a,
 #shortlog_data .comments-cnt a {
     background-image: url('../images/icons/comments.png');
     background-repeat: no-repeat;
     background-position: 100% 50%;
     padding: 5px 0;
     padding-right: 20px;
+}
 .right .changes {
     clear: both;
+}
 .right .changes .changed_total {
     display: block;
     float: right;
     text-align: center;
     min-width: 45px;
     cursor: pointer;
     color: #444444;
     background: #FEA;
     -webkit-border-radius: 0px 0px 0px 6px;
     border-radius: 0px 0px 0px 6px;
     padding: 1px;
+}
 .right .changes .added, .changed, .removed {
     display: block;
     padding: 1px;
     color: #444444;
     float: right;
     text-align: center;
     min-width: 15px;
+}
 .right .changes .added {
     background: #CFC;
+}
 .right .changes .changed {
     background: #FEA;
+}
 .right .changes .removed {
     background: #FAA;
+}
 .right .merge {
     padding: 1px 3px 1px 3px;
     background-color: #fca062;
     font-size: 10px;
     color: #ffffff;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
     margin-right: 2px;
+}
 .right .parent {
     color: #666666;
     clear: both;
+}
 .right .logtags {
     line-height: 2.2em;
+}
 .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
+}
 .branchtag,
 .tagtag,
 .booktag,
 .spantag {
     padding: 1px 3px 1px 3px;
     font-size: 10px;
     color: #336699;
     white-space: nowrap;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
+}
 #graph_content .branchtag,
 #graph_content .tagtag,
 #graph_content .booktag {
     margin: 1.1em 0;
     margin-right: 0.5em;
+}
 .branchtag,
 .tagtag,
 .booktag {
     float: left;
+}
 .right .logtags .branchtag,
 .right .logtags .tagtag,
 .right .logtags .booktag,
 .right .merge {
     float: right;
     line-height: 1em;
     margin: 1px 1px !important;
     display: block;
+}
 .booktag {
     border-color: #46A546;
     color: #46A546;
+}
 .tagtag {
     border-color: #62cffc;
     color: #62cffc;
+}
 .logtags .branchtag a:hover,
 .logtags .branchtag a,
 .branchtag a,
 .branchtag a:hover {
     text-decoration: none;
     color: inherit;
+}
 .logtags .tagtag {
     padding: 1px 3px 1px 3px;
     background-color: #62cffc;
     font-size: 10px;
     color: #ffffff;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 .tagtag a,
 .tagtag a:hover,
 .logtags .tagtag a,
 .logtags .tagtag a:hover {
     text-decoration: none;
     color: inherit;
+}
 .logbooks .booktag, .logbooks .booktag, .logtags .booktag, .logtags .booktag {
     padding: 1px 3px 1px 3px;
     background-color: #46A546;
     font-size: 10px;
     color: #ffffff;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 .logbooks .booktag, .logbooks .booktag a, .right .logtags .booktag, .logtags .booktag a {
     color: #ffffff;
+}
 .logbooks .booktag, .logbooks .booktag a:hover,
 .logtags .booktag, .logtags .booktag a:hover,
 .booktag a,
 .booktag a:hover {
     text-decoration: none;
     color: inherit;
+}
 div.browserblock {
     overflow: hidden;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 125%;
     padding: 0;
     -webkit-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.browserblock .browser-header {
     background: #FFF;
     padding: 10px 0px 15px 0px;
     width: 100%;
+}
 div.browserblock .browser-nav {
     float: left
+}
 div.browserblock .browser-branch {
     float: left;
+}
 div.browserblock .browser-branch label {
     color: #4A4A4A;
     vertical-align: text-top;
+}
 div.browserblock .browser-header span {
     margin-left: 5px;
     font-weight: 700;
+}
 div.browserblock .browser-search {
     clear: both;
     padding: 8px 8px 0px 5px;
     height: 20px;
+}
 div.browserblock #node_filter_box {
+}
 div.browserblock .search_activate {
     float: left
+}
 div.browserblock .add_node {
     float: left;
     padding-left: 5px;
+}
 div.browserblock .search_activate a:hover, div.browserblock .add_node a:hover {
     text-decoration: none !important;
+}
 div.browserblock .browser-body {
     background: #EEE;
     border-top: 1px solid #CCC;
+}
 table.code-browser {
     border-collapse: collapse;
     width: 100%;
+}
 table.code-browser tr {
     margin: 3px;
+}
 table.code-browser thead th {
     background-color: #EEE;
     height: 20px;
     font-size: 1.1em;
     font-weight: 700;
     text-align: left;
     padding-left: 10px;
+}
 table.code-browser tbody td {
     padding-left: 10px;
     height: 20px;
+}
 table.code-browser .browser-file {
     background: url("../images/icons/document_16.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     text-align: left;
+}
 .diffblock .changeset_header {
     height: 16px;
+}
 .diffblock .changeset_file {
     float: left;
+}
 .diffblock .diff-menu-wrapper {
     float: left;
+}
 .diffblock .diff-menu {
     position: absolute;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #003367 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid solid solid;
     border-width: 1px;
     box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
     margin-top: 5px;
     margin-left: 1px;
+}
 .diffblock .diff-actions {
     padding: 2px 0px 0px 2px;
     float: left;
+}
 .diffblock  .diff-menu ul li {
     padding: 0px 0px 0px 0px !important;
+}
 .diffblock  .diff-menu ul li a {
     display: block;
     padding: 3px 8px 3px 8px !important;
+}
 .diffblock  .diff-menu ul li a:hover {
     text-decoration: none;
     background-color: #EEEEEE;
+}
 table.code-browser .browser-dir {
     background: url("../images/icons/folder_16.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     text-align: left;
+}
 table.code-browser .submodule-dir {
     background: url("../images/icons/disconnect.png") no-repeat scroll 3px;
     height: 16px;
     padding-left: 20px;
     text-align: left;
+}
 .box .search {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 10px;
+}
 .box .search div.search_path {
     background: none repeat scroll 0 0 #EEE;
     border: 1px solid #CCC;
     color: blue;
     margin-bottom: 10px;
     padding: 10px 0;
+}
 .box .search div.search_path div.link {
     font-weight: 700;
     margin-left: 25px;
+}
 .box .search div.search_path div.link a {
     color: #003367;
     cursor: pointer;
     text-decoration: none;
+}
 #path_unlock {
     color: red;
     font-size: 1.2em;
     padding-left: 4px;
+}
 .info_box span {
     margin-left: 3px;
     margin-right: 3px;
+}
 .info_box .rev {
     color: #003367;
     font-size: 1.6em;
     font-weight: bold;
     vertical-align: sub;
+}
 .info_box input#at_rev, .info_box input#size {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 12px;
     margin: 0;
     padding: 1px 5px 1px;
+}
 .info_box input#view {
     text-align: center;
     padding: 4px 3px 2px 2px;
+}
 .yui-overlay, .yui-panel-container {
     visibility: hidden;
     position: absolute;
     z-index: 2;
+}
 #tip-box {
     position: absolute;
     background-color: #FFF;
     border: 2px solid #003367;
     font: 100% sans-serif;
     width: auto;
     opacity: 1;
     padding: 8px;
     white-space: pre-wrap;
     -webkit-border-radius: 8px 8px 8px 8px;
     -khtml-border-radius: 8px 8px 8px 8px;
     border-radius: 8px 8px 8px 8px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     -webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     z-index: 100000;
+}
 .hl-tip-box {
     visibility: hidden;
     position: absolute;
     color: #666;
     background-color: #FFF;
     border: 2px solid #003367;
     font: 100% sans-serif;
     width: auto;
     opacity: 1;
     padding: 8px;
     white-space: pre-wrap;
     -webkit-border-radius: 8px 8px 8px 8px;
     -khtml-border-radius: 8px 8px 8px 8px;
     border-radius: 8px 8px 8px 8px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 .mentions-container {
     width: 90% !important;
+}
 .mentions-container .yui-ac-content {
     width: 100% !important;
+}
 .ac {
     vertical-align: top;
+}
 .ac .yui-ac {
     position: inherit;
     font-size: 100%;
+}
 .ac .perm_ac {
     width: 20em;
+}
 .ac .yui-ac-input {
     width: 100%;
+}
 .ac .yui-ac-container {
     position: absolute;
     top: 1.6em;
     width: auto;
+}
 .ac .yui-ac-content {
     position: absolute;
     border: 1px solid gray;
     background: #fff;
     z-index: 9050;
+}
 .ac .yui-ac-shadow {
     position: absolute;
     width: 100%;
     background: #000;
     opacity: .10;
     filter: alpha(opacity = 10);
     z-index: 9049;
     margin: .3em;
+}
 .ac .yui-ac-content ul {
     width: 100%;
     margin: 0;
     padding: 0;
     z-index: 9050;
+}
 .ac .yui-ac-content li {
     cursor: default;
     white-space: nowrap;
     margin: 0;
     padding: 2px 5px;
     height: 18px;
     z-index: 9050;
     display: block;
     width: auto !important;
+}
 .ac .yui-ac-content li .ac-container-wrap {
     width: auto;
+}
 .ac .yui-ac-content li.yui-ac-prehighlight {
     background: #B3D4FF;
     z-index: 9050;
+}
 .ac .yui-ac-content li.yui-ac-highlight {
     background: #556CB5;
     color: #FFF;
     z-index: 9050;
+}
 .ac .yui-ac-bd {
     z-index: 9050;
+}
 .reposize {
     background: url("../images/icons/server.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 #repo_size {
     display: block;
     margin-top: 4px;
     color: #666;
     float: right;
+}
 .locking_locked {
     background: #FFF url("../images/icons/block_16.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 .locking_unlocked {
     background: #FFF url("../images/icons/accept.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 .currently_following {
     padding-left: 10px;
     padding-bottom: 5px;
+}
 .add_icon {
     background: url("../images/icons/add.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .accept_icon {
     background: url("../images/icons/accept.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .edit_icon {
     background: url("../images/icons/application_form_edit.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .delete_icon {
     background: url("../images/icons/delete.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .refresh_icon {
     background: url("../images/icons/arrow_refresh.png") no-repeat scroll
 px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .pull_icon {
     background: url("../images/icons/connect.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .rss_icon {
     background: url("../images/icons/rss_16.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 4px;
     text-align: left;
     font-size: 8px
+}
 .atom_icon {
     background: url("../images/icons/rss_16.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 4px;
     text-align: left;
     font-size: 8px
+}
 .archive_icon {
     background: url("../images/icons/compress.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 1px;
+}
 .start_following_icon {
     background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 0px;
+}
 .stop_following_icon {
     background: url("../images/icons/heart_delete.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 0px;
+}
 .action_button {
     border: 0;
     display: inline;
+}
 .action_button:hover {

rhodecode/templates/compare/compare_cs.html

➞

Show inline comments

 ## Changesets table !
 <div class="container">
   %if not c.cs_ranges:
     <span class="empty_data">${_('No changesets')}</span>
   %else:
     %if c.ancestor:
     <div class="ancestor">${_('Ancestor')}:
       ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}
     </div>
     %endif
     <table class="compare_view_commits noborder">
     %for cs in reversed(c.cs_ranges):
         <tr id="row-${cs.raw_id}">
         <td>
           %if cs.raw_id in c.statuses:
             <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
                 <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses[cs.raw_id][0])}" />
             </div>
           %endif
         </td>
         <td style="min-width: 120px"><span class="tooltip" title="${h.tooltip(h.age(cs.date))}">${cs.date}</span></td>
         <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
         <td><div class="author">${h.person(cs.author)}</div></td>
         <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))}
         %if c.as_form:
           ${h.hidden('revisions',cs.raw_id)}
         %endif
         </td>
         <td>
         %if cs.branch:
         <span class="branchtag">${cs.branch}</span>
         %endif
         </td>
         <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
             <i class="icon-resize-vertical" style="color:#DDD"></i>
         </td>
-        <td><div id="C-${cs.raw_id}" class="message" style="white-space:normal; height: 10px;width: 250px">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
+        <td><div id="C-${cs.raw_id}" class="message" style="white-space:normal; height:1.1em; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
         </tr>
     %endfor
     </table>
     %if c.as_form:
       ${h.hidden('ancestor_rev',c.ancestor)}
       ${h.hidden('merge_rev',c.cs_ranges[-1].raw_id)}
     %endif
   %endif
 </div>
 <script>
 $('.expand_commit').on('click',function(e){
     $(this).children('i').hide();
     var cid = $(this).attr('commit_id');
     $('#C-'+cid).css({'height': 'auto','width': 'auto', 'white-space': 'pre'})
 });
 $('.gravatar').on('click',function(e){
     var cid = $(this).attr('commit_id');
     $('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));
 });
 </script>

rhodecode/tests/functional/test_compare.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 from rhodecode.tests import *
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.meta import Session
 from rhodecode.model.db import Repository
 from rhodecode.model.scm import ScmModel
 from rhodecode.lib.vcs.backends.base import EmptyChangeset
 from rhodecode.tests.fixture import Fixture
 fixture = Fixture()
 def _commit_change(repo, filename, content, message, vcs_type, parent=None, newfile=False):
     repo = Repository.get_by_repo_name(repo)
     _cs = parent
     if not parent:
         _cs = EmptyChangeset(alias=vcs_type)
     if newfile:
         nodes = {
             filename: {
                 'content': content
+            }
+        }
         cs = ScmModel().create_nodes(
             user=TEST_USER_ADMIN_LOGIN, repo=repo,
             message=message,
             nodes=nodes,
             parent_cs=_cs,
             author=TEST_USER_ADMIN_LOGIN,
+        )
     else:
         cs = ScmModel().commit_change(
             repo=repo.scm_instance, repo_name=repo.repo_name,
             cs=parent, user=TEST_USER_ADMIN_LOGIN,
             author=TEST_USER_ADMIN_LOGIN,
             message=message,
             content=content,
             f_path=filename
+        )
     return cs
 def _commit_div(sha, msg):
-    return """<div id="C-%s" class="message" style="white-space:normal; height: 10px;width: 250px">%s</div>""" % (sha, msg)
+    return """<div id="C-%s" class="message" style="white-space:normal; height:1.1em; padding:0">%s</div>""" % (sha, msg)
 class TestCompareController(TestController):
     def setUp(self):
         self.r1_id = None
         self.r2_id = None
     def tearDown(self):
         if self.r2_id:
             RepoModel().delete(self.r2_id)
         if self.r1_id:
             RepoModel().delete(self.r1_id)
         Session().commit()
         Session.remove()
     def test_compare_forks_on_branch_extra_commits_hg(self):
         self.log_user()
         repo1 = fixture.create_repo('one', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         #commit something !
         cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
                              message='commit1', vcs_type='hg', parent=None, newfile=True)
         #fork this repo
         repo2 = fixture.create_fork('one', 'one-fork')
         self.r2_id = repo2.repo_id
         #add two extra commit into fork
         cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',
                              message='commit2', vcs_type='hg', parent=cs0)
         cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',
                              message='commit3', vcs_type='hg', parent=cs1)
         rev1 = 'default'
         rev2 = 'default'
         response = self.app.get(url('compare_url',
                                     repo_name=repo1.repo_name,
                                     org_ref_type="branch",
                                     org_ref=rev2,
                                     other_repo=repo2.repo_name,
                                     other_ref_type="branch",
                                     other_ref=rev1,
                                     merge='1',))
         response.mustcontain('%s@%s' % (repo1.repo_name, rev2))
         response.mustcontain('%s@%s' % (repo2.repo_name, rev1))
         response.mustcontain("""Showing 2 commits""")
         response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
         response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))
         response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))
         response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))
         #swap
         response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_forks_on_branch_extra_commits_git(self):
         self.log_user()
         repo1 = fixture.create_repo('one-git', repo_type='git',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         #commit something !
         cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
                              message='commit1', vcs_type='git', parent=None, newfile=True)
         #fork this repo
         repo2 = fixture.create_fork('one-git', 'one-git-fork')
         self.r2_id = repo2.repo_id
         #add two extra commit into fork
         cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',
                              message='commit2', vcs_type='git', parent=cs0)
         cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',
                              message='commit3', vcs_type='git', parent=cs1)
         rev1 = 'master'
         rev2 = 'master'
         response = self.app.get(url('compare_url',
                                     repo_name=repo1.repo_name,
                                     org_ref_type="branch",
                                     org_ref=rev2,
                                     other_repo=repo2.repo_name,
                                     other_ref_type="branch",
                                     other_ref=rev1,
                                     merge='1',))
         response.mustcontain('%s@%s' % (repo1.repo_name, rev2))
         response.mustcontain('%s@%s' % (repo2.repo_name, rev1))
         response.mustcontain("""Showing 2 commits""")
         response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
         response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))
         response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))
         response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))
         #swap
         response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):
         self.log_user()
         repo1 = fixture.create_repo('one', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         #commit something !
         cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
                              message='commit1', vcs_type='hg', parent=None, newfile=True)
         #fork this repo
         repo2 = fixture.create_fork('one', 'one-fork')
         self.r2_id = repo2.repo_id
         #now commit something to origin repo
         cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',
                                   message='commit2', vcs_type='hg', parent=cs0, newfile=True)
         #add two extra commit into fork
         cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',
                              message='commit2', vcs_type='hg', parent=cs0)
         cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',
                              message='commit3', vcs_type='hg', parent=cs1)
         rev1 = 'default'
         rev2 = 'default'
         response = self.app.get(url('compare_url',
                                     repo_name=repo1.repo_name,
                                     org_ref_type="branch",
                                     org_ref=rev2,
                                     other_repo=repo2.repo_name,
                                     other_ref_type="branch",
                                     other_ref=rev1,
                                     merge='1',))
         response.mustcontain('%s@%s' % (repo1.repo_name, rev2))
         response.mustcontain('%s@%s' % (repo2.repo_name, rev1))
         response.mustcontain("""Showing 2 commits""")
         response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
         response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))
         response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))
         response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))
         #swap
         response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_forks_on_branch_extra_commits_origin_has_incomming_git(self):
         self.log_user()
         repo1 = fixture.create_repo('one-git', repo_type='git',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         #commit something !
         cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
                              message='commit1', vcs_type='git', parent=None, newfile=True)
         #fork this repo
         repo2 = fixture.create_fork('one-git', 'one-git-fork')
         self.r2_id = repo2.repo_id
         #now commit something to origin repo
         cs1_prim = _commit_change(repo1.repo_name, filename='file2', content='line1file2\n',
                                   message='commit2', vcs_type='git', parent=cs0, newfile=True)
         #add two extra commit into fork
         cs1 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\n',
                              message='commit2', vcs_type='git', parent=cs0)
         cs2 = _commit_change(repo2.repo_name, filename='file1', content='line1\nline2\nline3\n',
                              message='commit3', vcs_type='git', parent=cs1)
         rev1 = 'master'
         rev2 = 'master'
         response = self.app.get(url('compare_url',
                                     repo_name=repo1.repo_name,
                                     org_ref_type="branch",
                                     org_ref=rev2,
                                     other_repo=repo2.repo_name,
                                     other_ref_type="branch",
                                     other_ref=rev1,
                                     merge='1',))
         response.mustcontain('%s@%s' % (repo1.repo_name, rev2))
         response.mustcontain('%s@%s' % (repo2.repo_name, rev1))
         response.mustcontain("""Showing 2 commits""")
         response.mustcontain("""1 file changed with 2 insertions and 0 deletions""")
         response.mustcontain(_commit_div(cs1.raw_id, 'commit2'))
         response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))
         response.mustcontain("""<a href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=1#C--826e8142e6ba">file1</a>""" % (repo1.repo_name, rev2, rev1, repo2.repo_name))
         #swap
         response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-refresh"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_cherry_pick_changesets_from_bottom(self):
 #        repo1:
 #            cs0:
 #            cs1:
 #        repo1-fork- in which we will cherry pick bottom changesets
 #            cs0:
 #            cs1:
 #            cs2: x
 #            cs3: x
 #            cs4: x
 #            cs5:
         #make repo1, and cs1+cs2
         self.log_user()
         repo1 = fixture.create_repo('repo1', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         #commit something !
         cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
                              message='commit1', vcs_type='hg', parent=None,
                              newfile=True)
         cs1 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\n',
                              message='commit2', vcs_type='hg', parent=cs0)
         #fork this repo
         repo2 = fixture.create_fork('repo1', 'repo1-fork')
         self.r2_id = repo2.repo_id
         #now make cs3-6
         cs2 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\n',
                              message='commit3', vcs_type='hg', parent=cs1)
         cs3 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\n',
                              message='commit4', vcs_type='hg', parent=cs2)
         cs4 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\n',
                              message='commit5', vcs_type='hg', parent=cs3)
         cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',
                              message='commit6', vcs_type='hg', parent=cs4)
         response = self.app.get(url('compare_url',
                                     repo_name=repo2.repo_name,
                                     org_ref_type="rev",
                                     org_ref=cs1.short_id,  # parent of cs2, in repo2
                                     other_repo=repo1.repo_name,
                                     other_ref_type="rev",
                                     other_ref=cs4.short_id,
                                     merge='True',
                                     ))
         response.mustcontain('%s@%s' % (repo2.repo_name, cs1.short_id))
         response.mustcontain('%s@%s' % (repo1.repo_name, cs4.short_id))
         response.mustcontain("""Showing 3 commits""")
         response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")
         response.mustcontain(_commit_div(cs2.raw_id, 'commit3'))
         response.mustcontain(_commit_div(cs3.raw_id, 'commit4'))
         response.mustcontain(_commit_div(cs4.raw_id, 'commit5'))
         response.mustcontain("""<a href="/%s/changeset/%s">r2:%s</a>""" % (repo1.repo_name, cs2.raw_id, cs2.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))
         ## files
         response.mustcontain("""#C--826e8142e6ba">file1</a>""")
     def test_compare_cherry_pick_changesets_from_top(self):
 #        repo1:
 #            cs0:
 #            cs1:
 #        repo1-fork- in which we will cherry pick bottom changesets
 #            cs0:
 #            cs1:
 #            cs2:
 #            cs3: x
 #            cs4: x
 #            cs5: x
+#
         #make repo1, and cs1+cs2
         self.log_user()
         repo1 = fixture.create_repo('repo1', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         #commit something !
         cs0 = _commit_change(repo1.repo_name, filename='file1', content='line1\n',
                              message='commit1', vcs_type='hg', parent=None,
                              newfile=True)
         cs1 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\n',
                              message='commit2', vcs_type='hg', parent=cs0)
         #fork this repo
         repo2 = fixture.create_fork('repo1', 'repo1-fork')
         self.r2_id = repo2.repo_id
         #now make cs3-6
         cs2 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\n',
                              message='commit3', vcs_type='hg', parent=cs1)
         cs3 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\n',
                              message='commit4', vcs_type='hg', parent=cs2)
         cs4 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\n',
                              message='commit5', vcs_type='hg', parent=cs3)
         cs5 = _commit_change(repo1.repo_name, filename='file1', content='line1\nline2\nline3\nline4\nline5\nline6\n',
                              message='commit6', vcs_type='hg', parent=cs4)
         response = self.app.get(url('compare_url',
                                     repo_name=repo1.repo_name,
                                     org_ref_type="rev",
                                     org_ref=cs2.short_id, # parent of cs3, not in repo2
                                     other_ref_type="rev",
                                     other_ref=cs5.short_id,
                                     merge='1',))
         response.mustcontain('%s@%s' % (repo1.repo_name, cs2.short_id))
         response.mustcontain('%s@%s' % (repo1.repo_name, cs5.short_id))
         response.mustcontain("""Showing 3 commits""")
         response.mustcontain("""1 file changed with 3 insertions and 0 deletions""")
         response.mustcontain(_commit_div(cs3.raw_id, 'commit4'))
         response.mustcontain(_commit_div(cs4.raw_id, 'commit5'))
         response.mustcontain(_commit_div(cs5.raw_id, 'commit6'))
         response.mustcontain("""<a href="/%s/changeset/%s">r3:%s</a>""" % (repo1.repo_name, cs3.raw_id, cs3.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r4:%s</a>""" % (repo1.repo_name, cs4.raw_id, cs4.short_id))
         response.mustcontain("""<a href="/%s/changeset/%s">r5:%s</a>""" % (repo1.repo_name, cs5.raw_id, cs5.short_id))
         ## files
         response.mustcontain("""#C--826e8142e6ba">file1</a>""")
     def test_compare_cherry_pick_changeset_mixed_branches(self):
         #TODO: write this
         assert 1
     def test_compare_remote_branches_hg(self):
         self.log_user()
         repo2 = fixture.create_fork(HG_REPO, HG_FORK)
         self.r2_id = repo2.repo_id
         rev1 = '56349e29c2af'
         rev2 = '7d4bc8ec6be5'
         response = self.app.get(url('compare_url',
                                     repo_name=HG_REPO,
                                     org_ref_type="rev",
                                     org_ref=rev1,
                                     other_ref_type="rev",
                                     other_ref=rev2,
                                     other_repo=HG_FORK,
                                     merge='1',))
         response.mustcontain('%s@%s' % (HG_REPO, rev1))
         response.mustcontain('%s@%s' % (HG_FORK, rev2))
         ## outgoing changesets between those revisions
         response.mustcontain("""<a href="/%s/changeset/2dda4e345facb0ccff1a191052dd1606dba6781d">r4:2dda4e345fac</a>""" % (HG_FORK))
         response.mustcontain("""<a href="/%s/changeset/6fff84722075f1607a30f436523403845f84cd9e">r5:6fff84722075</a>""" % (HG_FORK))
         response.mustcontain("""<a href="/%s/changeset/7d4bc8ec6be56c0f10425afb40b6fc315a4c25e7">r6:%s</a>""" % (HG_FORK, rev2))
         ## files
         response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))
         response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))
         response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--2f574d260608">vcs/backends/base.py</a>""" % (HG_REPO, rev1, rev2, HG_FORK))
     def test_compare_remote_branches_git(self):
         self.log_user()
         repo2 = fixture.create_fork(GIT_REPO, GIT_FORK)
         self.r2_id = repo2.repo_id
         rev1 = '102607b09cdd60e2793929c4f90478be29f85a17'
         rev2 = 'd7e0d30fbcae12c90680eb095a4f5f02505ce501'
         response = self.app.get(url('compare_url',
                                     repo_name=GIT_REPO,
                                     org_ref_type="rev",
                                     org_ref=rev1,
                                     other_ref_type="rev",
                                     other_ref=rev2,
                                     other_repo=GIT_FORK,
                                     merge='1',))
         response.mustcontain('%s@%s' % (GIT_REPO, rev1))
         response.mustcontain('%s@%s' % (GIT_FORK, rev2))
         ## outgoing changesets between those revisions
         response.mustcontain("""<a href="/%s/changeset/49d3fd156b6f7db46313fac355dca1a0b94a0017">r4:49d3fd156b6f</a>""" % (GIT_FORK))
         response.mustcontain("""<a href="/%s/changeset/2d1028c054665b962fa3d307adfc923ddd528038">r5:2d1028c05466</a>""" % (GIT_FORK))
         response.mustcontain("""<a href="/%s/changeset/d7e0d30fbcae12c90680eb095a4f5f02505ce501">r6:%s</a>""" % (GIT_FORK, rev2[:12]))
         ## files
         response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--9c390eb52cd6">vcs/backends/hg.py</a>""" % (GIT_REPO, rev1, rev2, GIT_FORK))
         response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--41b41c1f2796">vcs/backends/__init__.py</a>""" % (GIT_REPO, rev1, rev2, GIT_FORK))
         response.mustcontain("""<a href="/%s/compare/rev@%s...rev@%s?other_repo=%s&amp;merge=1#C--2f574d260608">vcs/backends/base.py</a>""" % (GIT_REPO, rev1, rev2, GIT_FORK))
     def test_org_repo_new_commits_after_forking_simple_diff_hg(self):
         self.log_user()
         repo1 = fixture.create_repo('one', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         r1_name = repo1.repo_name
         cs0 = _commit_change(repo=r1_name, filename='file1',
                        content='line1', message='commit1', vcs_type='hg',
                        newfile=True)
         Session().commit()
         self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id])
         #fork the repo1
         repo2 = fixture.create_repo('one-fork', repo_type='hg',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN,
                                     clone_uri=repo1.repo_full_path,
                                     fork_of='one')
         Session().commit()
         self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id])
         self.r2_id = repo2.repo_id
         r2_name = repo2.repo_name
         cs1 = _commit_change(repo=r2_name, filename='file1-fork',
                        content='file1-line1-from-fork', message='commit1-fork',
                        vcs_type='hg', parent=repo2.scm_instance[-1],
                        newfile=True)
         cs2 = _commit_change(repo=r2_name, filename='file2-fork',
                        content='file2-line1-from-fork', message='commit2-fork',
                        vcs_type='hg', parent=cs1,
                        newfile=True)
         cs3 = _commit_change(repo=r2_name, filename='file3-fork',
                        content='file3-line1-from-fork', message='commit3-fork',
                        vcs_type='hg', parent=cs2, newfile=True)
         #compare !
         rev1 = 'default'
         rev2 = 'default'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref=rev1,
                                     other_ref_type="branch",
                                     other_ref=rev2,
                                     other_repo=r1_name,
                                     merge='1',))
         response.mustcontain('%s@%s' % (r2_name, rev1))
         response.mustcontain('%s@%s' % (r1_name, rev2))
         response.mustcontain('No files')
         response.mustcontain('No changesets')
         cs0 = _commit_change(repo=r1_name, filename='file2',
                     content='line1-added-after-fork', message='commit2-parent',
                     vcs_type='hg', parent=None, newfile=True)
         #compare !
         rev1 = 'default'
         rev2 = 'default'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref=rev1,
                                     other_ref_type="branch",
                                     other_ref=rev2,
                                     other_repo=r1_name,
                                     merge='1',
                                     ))
         response.mustcontain('%s@%s' % (r2_name, rev1))
         response.mustcontain('%s@%s' % (r1_name, rev2))
         response.mustcontain("""commit2-parent""")
         response.mustcontain("""1 file changed with 1 insertions and 0 deletions""")
         response.mustcontain("""line1-added-after-fork""")
     def test_org_repo_new_commits_after_forking_simple_diff_git(self):
         self.log_user()
         repo1 = fixture.create_repo('one-git', repo_type='git',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
         self.r1_id = repo1.repo_id
         r1_name = repo1.repo_name
         cs0 = _commit_change(repo=r1_name, filename='file1',
                        content='line1', message='commit1', vcs_type='git',
                        newfile=True)
         Session().commit()
         self.assertEqual(repo1.scm_instance.revisions, [cs0.raw_id])
         #fork the repo1
         repo2 = fixture.create_repo('one-git-fork', repo_type='git',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN,
                                     clone_uri=repo1.repo_full_path,
                                     fork_of='one-git')
         Session().commit()
         self.assertEqual(repo2.scm_instance.revisions, [cs0.raw_id])
         self.r2_id = repo2.repo_id
         r2_name = repo2.repo_name
         cs1 = _commit_change(repo=r2_name, filename='file1-fork',
                        content='file1-line1-from-fork', message='commit1-fork',
                        vcs_type='git', parent=repo2.scm_instance[-1],
                        newfile=True)
         cs2 = _commit_change(repo=r2_name, filename='file2-fork',
                        content='file2-line1-from-fork', message='commit2-fork',
                        vcs_type='git', parent=cs1,
                        newfile=True)
         cs3 = _commit_change(repo=r2_name, filename='file3-fork',
                        content='file3-line1-from-fork', message='commit3-fork',
                        vcs_type='git', parent=cs2, newfile=True)
         #compare !
         rev1 = 'master'
         rev2 = 'master'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref=rev1,
                                     other_ref_type="branch",
                                     other_ref=rev2,
                                     other_repo=r1_name,
                                     merge='1',))
         response.mustcontain('%s@%s' % (r2_name, rev1))
         response.mustcontain('%s@%s' % (r1_name, rev2))
         response.mustcontain('No files')
         response.mustcontain('No changesets')
         cs0 = _commit_change(repo=r1_name, filename='file2',
                     content='line1-added-after-fork', message='commit2-parent',
                     vcs_type='git', parent=None, newfile=True)
         #compare !
         rev1 = 'master'
         rev2 = 'master'
         response = self.app.get(url('compare_url',
                                     repo_name=r2_name,
                                     org_ref_type="branch",
                                     org_ref=rev1,
                                     other_ref_type="branch",
                                     other_ref=rev2,
                                     other_repo=r1_name,
                                     merge='1',
                                     ))
         response.mustcontain('%s@%s' % (r2_name, rev1))
         response.mustcontain('%s@%s' % (r1_name, rev2))
         response.mustcontain("""commit2-parent""")
         response.mustcontain("""1 file changed with 1 insertions and 0 deletions""")
         response.mustcontain("""line1-added-after-fork""")

0 comments (0 inline, 0 general)