You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/08/27 01:07:07 UTC
[1/5] git commit: [#6284] ticket:418 added commit id to canvas at
commit browser page
Updated Branches:
refs/heads/master 0c7c4dd99 -> 09f02903f
[#6284] ticket:418 added commit id to canvas at commit browser page
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/690a66ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/690a66ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/690a66ca
Branch: refs/heads/master
Commit: 690a66ca422d659ca0b0559a0706192033b7c9bb
Parents: 6759394
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Mon Aug 19 16:04:34 2013 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Aug 26 22:52:35 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/repository.py | 1 +
Allura/allura/lib/widgets/resources/js/commit_browser.js | 2 +-
ForgeGit/forgegit/tests/functional/test_controllers.py | 1 +
ForgeSVN/forgesvn/tests/functional/test_controllers.py | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/690a66ca/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index b1b743c..f984a91 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -240,6 +240,7 @@ class RepoRootController(BaseController, FeedController):
msg = "No commit message."
result.append(dict(
oid=oid,
+ short_id=c.app.repo.shorthand_for_commit(oid),
row=row,
parents=ci.parent_ids,
message=msg,
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/690a66ca/Allura/allura/lib/widgets/resources/js/commit_browser.js
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/js/commit_browser.js b/Allura/allura/lib/widgets/resources/js/commit_browser.js
index 15c2a83..4375529 100644
--- a/Allura/allura/lib/widgets/resources/js/commit_browser.js
+++ b/Allura/allura/lib/widgets/resources/js/commit_browser.js
@@ -210,7 +210,7 @@ if($('#commit_graph')){
canvas_ctx.fill();
canvas_ctx.stroke();
canvas_ctx.fillStyle = "#000";
- canvas_ctx.fillText(commit.message, (1+next_column) * x_space, y_pos);
+ canvas_ctx.fillText(commit.message + " " + commit.short_id, (1+next_column) * x_space, y_pos);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/690a66ca/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 5af224e..bbcd88a 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -108,6 +108,7 @@ class TestRootController(_TestCase):
assert_equal(data['built_tree']['df30427c488aeab84b2352bdf88a3b19223f9d7a'],
{u'url': u'/p/test/src-git/ci/df30427c488aeab84b2352bdf88a3b19223f9d7a/',
u'oid': u'df30427c488aeab84b2352bdf88a3b19223f9d7a',
+ u'short_id': u'6a4588',
u'column': 0,
u'parents': [u'6a45885ae7347f1cac5103b0050cc1be6a1496c8'],
u'message': u'Add README', u'row': 2})
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/690a66ca/ForgeSVN/forgesvn/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index 78e7705..cc37545 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -100,6 +100,7 @@ class TestRootController(SVNTestController):
assert data['next_column'] == 1
for val in data['built_tree'].values():
if val['url'] == '/p/test/src/1/':
+ assert val['short_id'] == '[r1]'
assert val['column'] == 0
assert val['row'] == 4
assert val['message'] == 'Create readme'
[3/5] git commit: [#6284] ticket:418 fixed git commit browser test
Posted by br...@apache.org.
[#6284] ticket:418 fixed git commit browser test
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/55d3d3ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/55d3d3ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/55d3d3ff
Branch: refs/heads/master
Commit: 55d3d3ff3ad3b5de19335334a469fd8b2e0f08ce
Parents: 690a66c
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Fri Aug 23 13:29:36 2013 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Aug 26 22:52:36 2013 +0000
----------------------------------------------------------------------
ForgeGit/forgegit/tests/functional/test_controllers.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/55d3d3ff/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index bbcd88a..1222429 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -108,7 +108,7 @@ class TestRootController(_TestCase):
assert_equal(data['built_tree']['df30427c488aeab84b2352bdf88a3b19223f9d7a'],
{u'url': u'/p/test/src-git/ci/df30427c488aeab84b2352bdf88a3b19223f9d7a/',
u'oid': u'df30427c488aeab84b2352bdf88a3b19223f9d7a',
- u'short_id': u'6a4588',
+ u'short_id': u'[df3042]',
u'column': 0,
u'parents': [u'6a45885ae7347f1cac5103b0050cc1be6a1496c8'],
u'message': u'Add README', u'row': 2})
[2/5] git commit: [#6284] ticket:418 commit revision number in svn
commit browser
Posted by br...@apache.org.
[#6284] ticket:418 commit revision number in svn commit browser
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/67593942
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/67593942
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/67593942
Branch: refs/heads/master
Commit: 67593942258eaff592128d1997b244e192c355be
Parents: 0c7c4dd
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Fri Aug 16 13:29:45 2013 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Aug 26 22:52:35 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/repo/revision.html | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/67593942/Allura/allura/templates/widgets/repo/revision.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/revision.html b/Allura/allura/templates/widgets/repo/revision.html
index 48df9c1..f5c186d 100644
--- a/Allura/allura/templates/widgets/repo/revision.html
+++ b/Allura/allura/templates/widgets/repo/revision.html
@@ -18,6 +18,8 @@
-#}
{% from 'allura:templates/jinja_master/lib.html' import email_gravatar, abbr_date with context %}
<div class="commit-details">
+ <a href="{{value.url()}}">{{value.shorthand_id()}}</a>
+ Commit message:
<div class="commit-message">
<div class="first-line">{{g.markdown.convert(h.really_unicode(value.message.split('\n')[0]))}}</div>
{{g.markdown.convert(h.really_unicode('\n'.join(value.message.split('\n')[1:])))}}
[4/5] git commit: [#6284] move commit id to beginning of line so that
they all line up and are easier to visually scan
Posted by br...@apache.org.
[#6284] move commit id to beginning of line so that they all line up and are easier to visually scan
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/40b0823b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/40b0823b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/40b0823b
Branch: refs/heads/master
Commit: 40b0823b815cb58dde7529f64ed834cdd8f48d7d
Parents: 55d3d3f
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon Aug 26 23:02:06 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Aug 26 23:02:06 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/widgets/resources/js/commit_browser.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/40b0823b/Allura/allura/lib/widgets/resources/js/commit_browser.js
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/js/commit_browser.js b/Allura/allura/lib/widgets/resources/js/commit_browser.js
index 4375529..37c4408 100644
--- a/Allura/allura/lib/widgets/resources/js/commit_browser.js
+++ b/Allura/allura/lib/widgets/resources/js/commit_browser.js
@@ -210,7 +210,7 @@ if($('#commit_graph')){
canvas_ctx.fill();
canvas_ctx.stroke();
canvas_ctx.fillStyle = "#000";
- canvas_ctx.fillText(commit.message + " " + commit.short_id, (1+next_column) * x_space, y_pos);
+ canvas_ctx.fillText(commit.short_id + " " + commit.message, (1+next_column) * x_space, y_pos);
}
}
[5/5] git commit: Revert "[#6284] ticket:418 commit revision number
in svn commit browser"
Posted by br...@apache.org.
Revert "[#6284] ticket:418 commit revision number in svn commit browser"
This was also showing up on the individual commit page, which was
unnecessary since the info was already on that page. If we wanted something
just for the view within commit_browser, we could use Allura/allura/templates/repo/commit_basic.html
but it seemed out of place and not too necessary there also.
This reverts commit 67593942258eaff592128d1997b244e192c355be.
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/09f02903
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/09f02903
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/09f02903
Branch: refs/heads/master
Commit: 09f02903f14f320c8235bc9e29d187c3bb708d46
Parents: 40b0823
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon Aug 26 23:02:15 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Aug 26 23:02:15 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/repo/revision.html | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/09f02903/Allura/allura/templates/widgets/repo/revision.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/revision.html b/Allura/allura/templates/widgets/repo/revision.html
index f5c186d..48df9c1 100644
--- a/Allura/allura/templates/widgets/repo/revision.html
+++ b/Allura/allura/templates/widgets/repo/revision.html
@@ -18,8 +18,6 @@
-#}
{% from 'allura:templates/jinja_master/lib.html' import email_gravatar, abbr_date with context %}
<div class="commit-details">
- <a href="{{value.url()}}">{{value.shorthand_id()}}</a>
- Commit message:
<div class="commit-message">
<div class="first-line">{{g.markdown.convert(h.really_unicode(value.message.split('\n')[0]))}}</div>
{{g.markdown.convert(h.really_unicode('\n'.join(value.message.split('\n')[1:])))}}