Indefero

Indefero Commit Details


Date:2011-05-31 06:11:55 (14 years 5 months ago)
Author:Thomas Keller
Branch:develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3
Commit:ca2ef814fbe5c055e5cc0fce2e6d46aa9373f645
Parents: d079838818f12b5440e1d6c75a2af11876a906a7
Message:Add support for the display of monotone node attributes. (also fix the way the attributes view is displayed, i.e. do not use single strings, but one string in context which is much easier to translate)
Changes:

File differences

NEWS.mdtext
44
55
66
7
8
79
8
10
911
1012
1113
12
14
1315
1416
1517
␊
- Mercurial source views now show parent revisions (if any) and detailed change information␊
- File download URLs now contain the file name rather than the upload id; old links still work though (issue 686)␊
- Display monotone file and directory attributes in the tree and file view␊
(needs a monotone with an interface version of 13.1 or newer)␊
␊
## Bugfixes ␊
## Bugfixes␊
␊
- monotone zip archive entries now all carry the revision date as mtime (issue 645)␊
- Timeline only displays filter options for items a user has actually access to (issue 655)␊
- The log, tags and branches parsers for Mercurial are more robust now (issue 663) ␊
- The log, tags and branches parsers for Mercurial are more robust now (issue 663)␊
- Fix SSH public key parsing issues and improve the check for existing, uploaded keys (issue 679)␊
- Let the SVN command line client not store the login credentials we give him as arguments␊
␊
src/IDF/Scm/Monotone.php
3131
3232
3333
34
35
3634
3735
36
37
3838
3939
4040
......
699699
700700
701701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
702725
703726
704727
/** the minimum supported interface version */␊
public static $MIN_INTERFACE_VERSION = 13.0;␊
␊
private $stdio;␊
␊
private static $instances = array();␊
␊
private $stdio;␊
␊
/**␊
* Constructor␊
*/␊
}␊
␊
/**␊
* @see IDF_Scm::getProperties()␊
*/␊
public function getProperties($rev, $path='')␊
{␊
$out = $this->stdio->exec(array('interface_version'));␊
// support for querying file attributes of committed revisions␊
// was added for mtn 1.1 (interface version 13.1)␊
if (floatval($out) < 13.1)␊
return array();␊
␊
$out = $this->stdio->exec(array('get_attributes', $path), array('r' => $rev));␊
$stanzas = IDF_Scm_Monotone_BasicIO::parse($out);␊
$res = array();␊
␊
foreach ($stanzas as $stanza) {␊
$line = $stanza[0];␊
$res[$line['values'][0]] = $line['values'][1];␊
}␊
␊
return $res;␊
}␊
␊
/**␊
* @see IDF_Scm::getExtraProperties␊
*/␊
public function getExtraProperties($obj)␊
src/IDF/templates/idf/source/mtn/file.html
55
66
77
8
8
99
1010
11
12
13
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
1427
1528
1629
<h2 class="top"><a href="{url 'IDF_Views_Source::treeBase', array($project.shortname, $commit)}">{trans 'Root'}</a><span class="sep">/</span>{if $breadcrumb}{$breadcrumb|safe}{/if}</h2>␊
␊
<table class="code" summary=" ">␊
{if !$tree_in and !$tags_in}␊
{if (!$tree_in and !$tags_in) or $props}␊
{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}␊
<tfoot>␊
<tr><th colspan="2">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br/>␊
<span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>␊
</th></tr>␊
{if $props}␊
<tr><th colspan="2">␊
<ul>␊
{foreach $props as $prop => $val}␊
<li>{blocktrans}Property <strong>{$prop}</strong> set to <em>{$val}</em>{/blocktrans}</li>␊
{/foreach}␊
</ul>␊
</th></tr>␊
{/if}␊
{if !$tree_in and !$tags_in}␊
<tr>␊
<th colspan="2">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br/>␊
<span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>␊
</th>␊
</tr>␊
{/if}␊
</tfoot>␊
{/if}␊
<tbody>␊
src/IDF/templates/idf/source/mtn/tree.html
1111
1212
1313
14
14
15
1516
1617
17
18
19
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
2033
21
34
2235
2336
2437
<th>{trans 'Message'}</th>␊
<th>{trans 'Size'}</th>␊
</tr>␊
</thead>{if !$tree_in and !$tags_in}␊
</thead>␊
{if (!$tree_in and !$tags_in) or $props}␊
{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}␊
<tfoot>␊
<tr><th colspan="5">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br/>␊
<span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>␊
</th></tr>␊
{if $props}␊
<tr><th colspan="5">␊
<ul>␊
{foreach $props as $prop => $val}␊
<li>{blocktrans}Property <strong>{$prop}</strong> set to <em>{$val}</em>{/blocktrans}</li>␊
{/foreach}␊
</ul>␊
</th></tr>␊
{/if}␊
{if !$tree_in and !$tags_in}␊
<tr><th colspan="5">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br/>␊
<span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>␊
</th></tr>␊
{/if}␊
{/if}␊
</tfoot>␊
{/if}<tbody>␊
<tbody>␊
{if $base}␊
<tr>␊
<td>&nbsp;</td>␊
src/IDF/templates/idf/source/svn/file.html
66
77
88
9
9
1010
1111
1212
1313
1414
15
15
1616
1717
1818
␊
<table class="code" summary=" ">␊
{if !$tree_in || $props}␊
{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)} ␊
{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}␊
<tfoot>␊
{if $props}␊
<tr><th colspan="2">␊
<ul>␊
{foreach $props as $prop => $val}␊
<li>{trans 'Property'} <strong>{$prop}</strong> {trans 'set to:'} <em>{$val}</em></li>␊
<li>{blocktrans}Property <strong>{$prop}</strong> set to <em>{$val}</em>{/blocktrans}</li>␊
{/foreach}␊
</ul>␊
</th></tr>␊
src/IDF/templates/idf/source/svn/tree.html
1313
1414
1515
16
16
1717
1818
1919
2020
2121
22
22
2323
2424
2525
......
4545
4646
4747
48
48
4949
5050
5151
<th>{trans 'Size'}</th>␊
</tr>␊
</thead>{if (!$tree_in and !$tags_in and $commit != 'HEAD') || $props}␊
{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)} ␊
{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}␊
<tfoot>␊
{if $props}␊
<tr><th colspan="6">␊
<ul>␊
{foreach $props as $prop => $val}␊
<li>{trans 'Property'} <strong>{$prop}</strong> {trans 'set to:'} <em>{$val}</em></li>␊
<li>{blocktrans}Property <strong>{$prop}</strong> set to <em>{$val}</em>{/blocktrans}</li>␊
{/foreach}␊
</ul>␊
</th></tr>␊
<td class="fileicon"><img src="{media '/idf/img/'~$file.type~'.png'}" alt="{$file.type}" /></td>␊
␊
<td><a href="{$url}">{$file.file}</a></td>␊
<td><span class="smaller">{$file.date|dateago:"without"}</span></td> ␊
<td><span class="smaller">{$file.date|dateago:"without"}</span></td>␊
<td>{$file.rev}</td>␊
<td{if $file.type != 'blob'} colspan="2"{/if}><span class="smaller">{$file.author|strip_tags|trim}{trans ':'} {issuetext $file.log, $request, true, false}</span></td>␊
{if $file.type == 'blob'}␊
test/IDF/Scm/MonotoneTest.php
714714
715715
716716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
717742
718743
719744
$this->assertEquals('', $commit->diff);␊
}␊
␊
public function testGetProperties()␊
{␊
$rev = "2345678901234567890123456789012345678901";␊
␊
$instance = $this->createMock();␊
$instance->getStdio()->setExpectedOutput(array('interface_version'), array(), '13.1');␊
␊
$stdio =<<<END␊
attr "foo" "bar"␊
state "unchanged"␊
␊
attr "some new␊
line" "and more <weird>-␊
nesses"␊
END;␊
$instance->getStdio()->setExpectedOutput(array('get_attributes', 'foo'), array('r' => $rev), $stdio);␊
$res = $instance->getProperties($rev, 'foo');␊
␊
$this->assertEquals(2, count($res));␊
$this->assertEquals(array(␊
'foo' => 'bar',␊
"some new\nline" => "and more <weird>-\nnesses"␊
), $res);␊
}␊
␊
public function testGetExtraProperties()␊
{␊
$instance = $this->createMock();␊

Archive Download the corresponding diff file

Page rendered in 0.24199s using 13 queries.